Resolve conflicts

Signed-off-by: Matt Lord <[email protected]>

go/vt/vtgate/schema/tracker.go

@@ -21,26 +21,21 @@ import (
 	"sync"
 	"time"
 
-<<<<<<< HEAD
-	vtrpcpb "vitess.io/vitess/go/vt/proto/vtrpc"
-	"vitess.io/vitess/go/vt/sidecardb"
-	"vitess.io/vitess/go/vt/vterrors"
-
-	"vitess.io/vitess/go/vt/callerid"
-
-	"vitess.io/vitess/go/vt/vttablet/queryservice"
+	"golang.org/x/exp/maps"
 
 	"vitess.io/vitess/go/mysql"
 	"vitess.io/vitess/go/sqltypes"
-	querypb "vitess.io/vitess/go/vt/proto/query"
-=======
-	"golang.org/x/exp/maps"
->>>>>>> 24ea6f20b7 (vtgate: fix race condition iterating tables and views from schema tracker (#13673))
-
+	"vitess.io/vitess/go/vt/callerid"
 	"vitess.io/vitess/go/vt/discovery"
 	"vitess.io/vitess/go/vt/log"
+	"vitess.io/vitess/go/vt/sidecardb"
 	"vitess.io/vitess/go/vt/sqlparser"
+	"vitess.io/vitess/go/vt/vterrors"
 	"vitess.io/vitess/go/vt/vtgate/vindexes"
+	"vitess.io/vitess/go/vt/vttablet/queryservice"
+
+	querypb "vitess.io/vitess/go/vt/proto/query"
+	vtrpcpb "vitess.io/vitess/go/vt/proto/vtrpc"
 )
 
 type (