resolved conflict

Calorimeter/CaloEvent/CaloEvent/CaloBCIDAverage.h

Control/PileUpComps/CMakeLists.txt

Control/PileUpTools/PileUpTools/PileUpMergeSvc.icc

DetectorDescription/AGDD/AGDD2GeoSvc/src/AGDD2GeoSvc.cxx

DetectorDescription/GeoModel/AtlasGeoModel/python/InDetGM.py

Event/EventTPCnv/EventTPCnv/EventStreamInfo_p2.h

ForwardDetectors/ALFA/ALFA_Ntuple/ALFA_Ntuple/ALFA_Ntuple.h

ForwardDetectors/ALFA/ALFA_Ntuple/CMakeLists.txt

ForwardDetectors/ALFA/ALFA_Ntuple/src/ALFA_Ntuple.cxx

...tor/InDetCalibAlgs/SCT_CalibAlgs/src/IElementStreamer.cxx

...InDetDetDescr/PixelGeoModel/python/PixelGeoModelConfig.py

...tor/InDetDetDescr/PixelGeoModel/src/PixelDetectorTool.cxx

...ector/InDetDetDescr/PixelGeoModel/src/PixelDetectorTool.h

InnerDetector/InDetDetDescr/SCT_Cabling/CMakeLists.txt

...ization/BCM_Digitization/python/BCM_DigitizationConfig.py

...tion/BCM_Digitization/python/BCM_DigitizationConfigNew.py

...ation/PixelDigitization/python/PixelDigitizationConfig.py

...tion/SCT_Digitization/python/SCT_DigitizationConfigNew.py

...ization/TRT_Digitization/python/TRT_DigitizationConfig.py

...tor/InDetExample/InDetRecExample/python/TrackingCommon.py