diff --git a/surfer.json b/surfer.json
index 2c9fa42ef..2de24cdbe 100644
--- a/surfer.json
+++ b/surfer.json
@@ -20,11 +20,7 @@
       "brandShortName": "Zen",
       "brandFullName": "Zen Browser",
       "release": {
-<<<<<<< Updated upstream
-        "displayVersion": "1.18.7b",
-=======
         "displayVersion": "1.18.8b",
->>>>>>> Stashed changes
         "github": {
           "repo": "zen-browser/desktop"
         },