Update HRSMaterial.cc

Resolving conflicts