diff --git a/templates/conf/settings.yml.j2 b/templates/conf/settings.yml.j2
index f75c035..2e4ebd0 100755
--- a/templates/conf/settings.yml.j2
+++ b/templates/conf/settings.yml.j2
@@ -240,14 +240,13 @@ hostname_replace:
 #  '(.*\.)?tiktok\.com$':            'tt.opnxng.com'
   '(.*\.)?tieba.baidu\.com$':       'ti.opnxng.com'
   '(.*\.)?wolframalpha\.com$':            'wf.opnxng.com'
-#  '(.*\.)?stackoverflow\.com$':    'code.whatever.social'
-  '(.*\.)?stackoverflow\.com$': 'code.whatever.social/exchange/stackoverflow.com'
+  '(.*\.)?stackoverflow\.com$':    'code.whatever.social'
+  '(.*\.)?stackexchange\.com$':    'code.whatever.social'
   '(.*\.)?superuser\.com$': 'code.whatever.social/exchange/superuser.com'
   '(.*\.)?serverfault\.com$': 'code.whatever.social/exchange/serverfault.com'
   '(.*\.)?mathoverflow\.net$': 'code.whatever.social/exchange/mathoverflow.net'
   '(.*\.)?stackapps\.com$': 'code.whatever.social/exchange/stackapps.com'
   '(.*\.)?askubuntu\.com$': 'code.whatever.social/exchange/askubuntu.com'
-  '(.*\.)?stackexchange\.com$': 'code.whatever.social/exchange/stackexchange.com'
 
   # block bload domains
 
diff --git a/vars/services.yaml b/vars/services.yaml
index e29a032..d4a3523 100644
--- a/vars/services.yaml
+++ b/vars/services.yaml
@@ -1,12 +1,37 @@
+<<<<<<< Updated upstream
 compose:
-  oracle1:
-    - proxigram
-  oracle2:
-    - proxigram
-  oracle3:
-    - proxigram
   oracle4:
-    - proxigram
+    - paulgo
+
+config:
+  oracle4:
+=======
+remove:
+  oracle1:
+    - paulgo
+  oracle2:
+    - paulgo
+  oracle3:
+    - paulgo
+
+down:
+  oracle1:
+    - paulgo
+  oracle2:
+    - paulgo
+  oracle3:
+    - paulgo
+
+config:
+  oracle4:
+    - caddy
+    - paulgo
+
+compose:
+  oracle4:
+    - caddy
+>>>>>>> Stashed changes
+    - paulgo
 
 # ----------------------------------------------------------------------------------------------------