diff --git a/lsbeat.template.json b/lsbeat.template.json
index 64c0932..278efa7 100644
--- a/lsbeat.template.json
+++ b/lsbeat.template.json
@@ -41,13 +41,6 @@
         "filename": {
           "norms": false,
           "type": "text"
-<<<<<<< Updated upstream
-=======
-        },
-        "fullname": {
-          "ignore_above": 1024,
-          "type": "keyword"
->>>>>>> Stashed changes
         },
         "filesize": {
           "type": "long"
@@ -71,4 +64,4 @@
     "index.refresh_interval": "5s"
   },
   "template": "lsbeat-*"
-}
\ No newline at end of file
+}