diff --git a/package.json b/package.json
index 0b18d4ef4c..b2ee54f2e9 100644
--- a/package.json
+++ b/package.json
@@ -120,7 +120,6 @@
     "webpack": "^1.12.14"
   },
   "optionalDependencies": {
-<<<<<<< HEAD
     "olm": "https://matrix.org/packages/npm/olm/olm-1.3.0.tgz"
   },
   "build": {