From .
 * [new ref]                   HEAD       -> merge-attempt
From https://github.com/cms-sw/cmssw
 * [new ref]                   refs/pull/48002/head -> cms-sw/refs/pull/48002/head
Switched to branch 'merge-attempt'
Auto-merging DataFormats/L1TParticleFlow/interface/datatypes.h
CONFLICT (content): Merge conflict in DataFormats/L1TParticleFlow/interface/datatypes.h
Auto-merging DataFormats/L1TParticleFlow/src/classes_def.xml
CONFLICT (content): Merge conflict in DataFormats/L1TParticleFlow/src/classes_def.xml
Auto-merging L1Trigger/Phase2L1ParticleFlow/src/l1-converters/tkinput_ref.cpp
CONFLICT (content): Merge conflict in L1Trigger/Phase2L1ParticleFlow/src/l1-converters/tkinput_ref.cpp
Auto-merging L1Trigger/Phase2L1ParticleFlow/test/make_l1ct_binaryFiles_cfg.py
CONFLICT (content): Merge conflict in L1Trigger/Phase2L1ParticleFlow/test/make_l1ct_binaryFiles_cfg.py
Automatic merge failed; fix conflicts and then commit the result.
Unable to merge branch refs/pull/48002/head from repository cms-sw.