diff --git a/package.json b/package.json
index a68ac6d..7b5991c 100644
--- a/package.json
+++ b/package.json
@@ -41,11 +41,7 @@
     "@cosmjs/tendermint-rpc": "^0.31.0",
     "@dydxprotocol/v4-abacus": "^1.2.3",
     "@dydxprotocol/v4-client-js": "^1.0.11",
-<<<<<<< HEAD
     "@dydxprotocol/v4-localization": "^1.1.11",
-=======
-    "@dydxprotocol/v4-localization": "^1.1.9",
->>>>>>> b856a74 (Support notification for trading rewards)
     "@ethersproject/providers": "^5.7.2",
     "@js-joda/core": "^5.5.3",
     "@radix-ui/react-accordion": "^1.1.2",