message: Fix merge conflict correctly
diff: @@ -50,7 +50,7 @@ class TRTCalibrationResource : public tensorflow::ResourceBase {
  allocator_.reset();
  }
  - string DebugString() override {
  + string DebugString() const override {
  std::stringstream oss;
  using std::dec;
  using std::endl;
  