diff --git a/config/Surge.sgmodule b/config/Surge.sgmodule
index ecc9bc7..0a3c364 100644
--- a/config/Surge.sgmodule
+++ b/config/Surge.sgmodule
@@ -4,4 +4,8 @@
 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