diff --git a/scripts/index.js b/scripts/index.js
index 5a1f937..f9b45aa 100644
--- a/scripts/index.js
+++ b/scripts/index.js
@@ -621,11 +621,7 @@ function gameWinDaily() {
         action: function(linkButton) {
           let d = new Date();
           let str =
-<<<<<<< HEAD
             `Daily Befuddle ${d.toLocaleDateString("en-US")}\n${wr}/${window.game.daily.lives}${(window.gameSesh.hideBlanks ? '*' : '')}\n${window.location.href}`;
-=======
-            `Daily Befuddle${d.toLocaleDateString("en-US")}\n${wr}/${window.game.daily.lives}${(window.gameSesh.hideBlanks ? '*' : '')}\n${window.location.href}`;
->>>>>>> b7c7fe59f06d0138cdd8160c5438766093ee8f0a
           clipboardHandler(linkButton, str);
           return false;
         }