fixing conflicts

Inputs/DetectorConfiguration/csi.detector

Inputs/DetectorConfiguration/hira.detector

Inputs/DetectorConfiguration/hira_upgrade.detector

Inputs/DetectorConfiguration/plastic.detector

Inputs/EventGenerator/11Be_d3He.reaction

Inputs/EventGenerator/3He.source

Inputs/EventGenerator/deuton.source

Inputs/EventGenerator/proton.source

Inputs/EventGenerator/triton.source

NPLib/Core/NPInputParser.cxx

NPLib/Detectors/GeTAMU/TGeTAMUPhysics.cxx

NPSimulation/Core/NPSVDetector.cc

NPSimulation/Core/NPSVDetector.hh

NPSimulation/Detectors/CsI/CsI.cc

NPSimulation/Detectors/Microball/Microball.cc

NPSimulation/EventGenerator/EventGeneratorIsotropic.cc

NPSimulation/Scorers/CMakeLists.txt

NPSimulation/Scorers/CalorimeterScorers.cc

NPSimulation/Scorers/CalorimeterScorers.hh

NPSimulation/Scorers/ObsoleteGeneralScorers.cc