diff --git a/go/vt/vtorc/inst/instance_dao.go b/go/vt/vtorc/inst/instance_dao.go
index 146cacd75c9..e8a3dd18933 100644
--- a/go/vt/vtorc/inst/instance_dao.go
+++ b/go/vt/vtorc/inst/instance_dao.go
@@ -102,6 +102,9 @@ func initializeInstanceDao() {
 	forgetAliases = cache.New(time.Duration(config.Config.InstancePollSeconds*3)*time.Second, time.Second)
 	cacheInitializationCompleted.Store(true)
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> 888df9228e (Fix flakiness in VTOrc tests (#13489))
+=======
 >>>>>>> 888df9228e (Fix flakiness in VTOrc tests (#13489))
 =======
 >>>>>>> 888df9228e (Fix flakiness in VTOrc tests (#13489))
diff --git a/go/vt/vtorc/inst/instance_dao_test.go b/go/vt/vtorc/inst/instance_dao_test.go
index ae497a65fb6..c58b9e375d5 100644
--- a/go/vt/vtorc/inst/instance_dao_test.go
+++ b/go/vt/vtorc/inst/instance_dao_test.go
@@ -652,6 +652,9 @@ func waitForCacheInitialization() {
 	}
 }
 <<<<<<< HEAD
+<<<<<<< HEAD
+>>>>>>> 888df9228e (Fix flakiness in VTOrc tests (#13489))
+=======
 >>>>>>> 888df9228e (Fix flakiness in VTOrc tests (#13489))
 =======
 >>>>>>> 888df9228e (Fix flakiness in VTOrc tests (#13489))