Update HRSRootTree.hh

Resolving conflicts