diff --git a/package.json b/package.json
index fd5a1bbb0..d16f0ad0f 100644
--- a/package.json
+++ b/package.json
@@ -44,12 +44,9 @@
     "react-fast-marquee": "^1.1.4",
     "react-merge-refs": "^1.1.0",
     "react-use-measure": "^2.0.4",
-<<<<<<< HEAD
     "sharp": "^0.29.1",
     "shopify-buy": "^2.11.0",
-=======
     "stripe": "^8.176.0",
->>>>>>> 3f0c38461b478a48520bd91ba9240bfec478b7fb
     "swell-js": "^4.0.0-next.0",
     "swr": "^0.5.6",
     "tabbable": "^5.2.0",