From . * [new ref] HEAD -> merge-attempt From https://github.com/cms-sw/cmssw * [new ref] refs/pull/48080/head -> cms-sw/refs/pull/48080/head Switched to branch 'merge-attempt' Auto-merging PhysicsTools/BPHNano/plugins/DiLeptonBuilder.cc CONFLICT (content): Merge conflict in PhysicsTools/BPHNano/plugins/DiLeptonBuilder.cc Auto-merging PhysicsTools/BPHNano/python/MuMu_cff.py CONFLICT (content): Merge conflict in PhysicsTools/BPHNano/python/MuMu_cff.py Automatic merge failed; fix conflicts and then commit the result. Unable to merge branch refs/pull/48080/head from repository cms-sw.