From . * [new ref] HEAD -> merge-attempt From https://github.com/cms-sw/cmssw * [new ref] refs/pull/48319/head -> cms-sw/refs/pull/48319/head Switched to branch 'merge-attempt' Auto-merging DataFormats/HGCalReco/src/classes_def.xml CONFLICT (content): Merge conflict in DataFormats/HGCalReco/src/classes_def.xml Auto-merging DataFormats/TICLReco/interface/Common.h Auto-merging DataFormats/TICLReco/interface/TICLLayerTile.h Auto-merging RecoHGCal/TICL/plugins/TICLLayerTileProducer.cc Auto-merging RecoParticleFlow/PFClusterProducer/plugins/PFClusterFromHGCalTrackster.cc Automatic merge failed; fix conflicts and then commit the result. Unable to merge branch refs/pull/48319/head from repository cms-sw.