diff --git a/library.json b/library.json
index d9f37e0..b4a4461 100644
--- a/library.json
+++ b/library.json
@@ -6,12 +6,7 @@
     "compatibility": {
         "version": "7.1"
     },
-<<<<<<< HEAD
-    "version": "1.003",
-=======
     "version": "1.004",
->>>>>>> e2bee19 (key angepasst)
-
     "build": 0,
     "date": 0
 }
\ No newline at end of file