Update HRSHadronPhysics.cc

Resolving conflicts