From 0f81a87ba6036e00eae7e07b39fe6c486ba962c8 Mon Sep 17 00:00:00 2001
From: Vincent Chau <99756290+vincentwschau@users.noreply.github.com>
Date: Fri, 9 Aug 2024 11:45:26 -0400
Subject: [PATCH] Fix conflicts.

---
 protocol/app/upgrades/v6.0.0/upgrade.go | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/protocol/app/upgrades/v6.0.0/upgrade.go b/protocol/app/upgrades/v6.0.0/upgrade.go
index 95b6a39920..01e3c53e72 100644
--- a/protocol/app/upgrades/v6.0.0/upgrade.go
+++ b/protocol/app/upgrades/v6.0.0/upgrade.go
@@ -12,14 +12,9 @@ import (
 	clobtypes "github.com/dydxprotocol/v4-chain/protocol/x/clob/types"
 	pricestypes "github.com/dydxprotocol/v4-chain/protocol/x/prices/types"
 	revsharetypes "github.com/dydxprotocol/v4-chain/protocol/x/revshare/types"
-<<<<<<< HEAD
 	vaultkeeper "github.com/dydxprotocol/v4-chain/protocol/x/vault/keeper"
 	vaulttypes "github.com/dydxprotocol/v4-chain/protocol/x/vault/types"
-	"github.com/skip-mev/slinky/oracle/config"
-	"github.com/skip-mev/slinky/providers/apis/dydx"
-=======
 	dydx "github.com/skip-mev/slinky/providers/apis/dydx"
->>>>>>> 697c276b (upgrade slinky to 1.0.8 (#2069))
 	dydxtypes "github.com/skip-mev/slinky/providers/apis/dydx/types"
 	marketmapkeeper "github.com/skip-mev/slinky/x/marketmap/keeper"
 	marketmaptypes "github.com/skip-mev/slinky/x/marketmap/types"