diff --git a/fxmanifest.lua b/fxmanifest.lua
index 8e71915..1a0a00d 100644
--- a/fxmanifest.lua
+++ b/fxmanifest.lua
@@ -2,13 +2,8 @@ fx_version "cerulean"
 
 description "A better document management script"
 author "K5 Scripts"
-<<<<<<< HEAD
-version '1.1.2'
-update "Design changes, added version check"
-=======
 version '1.1.3'
 update "Added option to create documents from other scripts"
->>>>>>> e5cfc1b (add server document, better version check)
 repository 'https://github.com/kac5a/k5_documents'
 
 lua54 'yes'