diff --git a/go/vt/mysqlctl/filebackupstorage/file.go b/go/vt/mysqlctl/filebackupstorage/file.go
index cbba1424d8a..9c3e8165e2c 100644
--- a/go/vt/mysqlctl/filebackupstorage/file.go
+++ b/go/vt/mysqlctl/filebackupstorage/file.go
@@ -27,13 +27,8 @@ import (
 
 	"github.com/spf13/pflag"
 
-<<<<<<< HEAD
-=======
-	"vitess.io/vitess/go/os2"
-	"vitess.io/vitess/go/vt/mysqlctl/errors"
-
->>>>>>> 770dcf0914 (Replace uses of os.Create with os2.Create within backup/restore workflows (#17648))
 	"vitess.io/vitess/go/ioutil"
+	"vitess.io/vitess/go/os2"
 	"vitess.io/vitess/go/vt/concurrency"
 	stats "vitess.io/vitess/go/vt/mysqlctl/backupstats"
 	"vitess.io/vitess/go/vt/mysqlctl/backupstorage"
diff --git a/go/vt/mysqlctl/mysqld.go b/go/vt/mysqlctl/mysqld.go
index cbdc06a299a..f42c68fb52f 100644
--- a/go/vt/mysqlctl/mysqld.go
+++ b/go/vt/mysqlctl/mysqld.go
@@ -47,11 +47,7 @@ import (
 	"vitess.io/vitess/config"
 	"vitess.io/vitess/go/mysql"
 	"vitess.io/vitess/go/mysql/sqlerror"
-<<<<<<< HEAD
-=======
 	"vitess.io/vitess/go/os2"
-	"vitess.io/vitess/go/osutil"
->>>>>>> 770dcf0914 (Replace uses of os.Create with os2.Create within backup/restore workflows (#17648))
 	"vitess.io/vitess/go/protoutil"
 	"vitess.io/vitess/go/sqltypes"
 	"vitess.io/vitess/go/vt/dbconfigs"