diff --git a/composer.json b/composer.json
index cbc49d4..bfd26b9 100644
--- a/composer.json
+++ b/composer.json
@@ -1,10 +1,6 @@
 {
     "name": "zekythewolf/lgsq",
     "description": "Live Game Server Query",
-<<<<<<< HEAD
-=======
-    "version": "1.1.3",
->>>>>>> 9c08bba3050d3a0ac004de20848420023418f8ea
     "keywords": [
         "zekywolf",
         "lgsq"