Activate again automatic merges for CMSSW_7_3_ROOT6_X