diff --git a/config/Surge.sgmodule b/config/Surge.sgmodule
index 0a3c364..4aa259a 100644
--- a/config/Surge.sgmodule
+++ b/config/Surge.sgmodule
@@ -4,8 +4,5 @@
 hostname=sub.store
 
 [Script]
-<<<<<<< HEAD
 Sub-Store = type=http-request,pattern=^https?:\/\/sub\.store,script-path=sub-store.js,requires-body=true,timeout=120
-=======
-Sub-Store = type=http-request,pattern=^https?:\/\/sub\.com,script-path=sub-store.js,requires-body=true,timeout=120
->>>>>>> master
+