Update HRSTransport.cc

Resolving conflicts