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