diff --git a/public/index.html b/public/index.html
index 6adbab4..9478a5f 100644
--- a/public/index.html
+++ b/public/index.html
@@ -22,8 +22,7 @@
 
   <!-- Twitter -->
   <meta name="twitter:card" content="summary">
-  <meta name="twitter:url" content="https://conn-delta.vercel.app/" id="twUrl">
-  <meta name="twitter:title" content="Conn �?" All Links at One Place" id="twTitle">
+  <meta name="twitter:title" content="Conn — All Links at One Place" id="twTitle">
   <meta name="twitter:description" content="All my links in one place. Connect with me across the web." id="twDesc">
   <meta name="twitter:image" content="https://conn-delta.vercel.app/assets/og-home.jpg" id="twImage">
 
@@ -43,12 +42,10 @@
       var canonical = document.getElementById('canonicalTag');
       var ogUrl = document.getElementById('ogUrl');
       var ogImage = document.getElementById('ogImage');
-      var twUrl = document.getElementById('twUrl');
       var twImage = document.getElementById('twImage');
       if (canonical) canonical.href = origin + '/';
       if (ogUrl) ogUrl.content = origin + '/';
       if (ogImage) ogImage.content = origin + '/assets/og-home.jpg';
-      if (twUrl) twUrl.content = origin + '/';
       if (twImage) twImage.content = origin + '/assets/og-home.jpg';
     })();
   </script>
diff --git a/public/js/app.js b/public/js/app.js
index 438679e..4f75416 100644
--- a/public/js/app.js
+++ b/public/js/app.js
@@ -101,14 +101,10 @@
           .replace(/@import\s+/gi, '/* @import blocked */ ')
           .replace(/-moz-binding\s*:/gi, '/* blocked */')
           .replace(/behavior\s*:/gi, '/* blocked */')
-<<<<<<< fix/179-dynamic-og-domain
-          .replace(/url\(["']?data:/gi, 'url(invalid:');
-=======
           .replace(/url\(["']?data:/gi, 'url(invalid:')
           .replace(/position\s*:\s*fixed/gi, '/* position:fixed blocked */')
           .replace(/position\s*:\s*sticky/gi, '/* position:sticky blocked */')
           .replace(/z-index\s*:/gi, '/* z-index blocked */');
->>>>>>> main
         var style = document.createElement('style');
         style.textContent = sanitized;
         document.head.appendChild(style);
diff --git a/server.js b/server.js
index fb5cf19..2363f4d 100644
--- a/server.js
+++ b/server.js
@@ -77,11 +77,7 @@ const clickLimiter = rateLimit({
   standardHeaders: true,
   legacyHeaders: false,
   message: {
-<<<<<<< fix/179-dynamic-og-domain
-    error: 'Too many requests. Please slow down.'
-=======
     error: 'Too many click requests. Please slow down.'
->>>>>>> main
   }
 });
 
@@ -1256,11 +1252,7 @@ app.put('/api/links-reorder', requireAuth, async (req, res) => {
 });
 
 // Track clicks (public — find link by ID across all users)
-<<<<<<< fix/179-dynamic-og-domain
-app.post('/api/links/:id/click', clickLimiter, async (req, res) => {
-=======
 app.post('/api/links/:id/click', requireAuth, clickLimiter, async (req, res) => {
->>>>>>> main
   const { data: link } = await supabase
     .from('user_links')
     .select('id, clicks')