diff --git a/functions/core_functions.sh b/functions/core_functions.sh
index 878763b65..8e7b530c4 100644
--- a/functions/core_functions.sh
+++ b/functions/core_functions.sh
@@ -2,11 +2,7 @@
 # LGSM core_functions.sh function
 # Author: Daniel Gibbs
 # Website: http://gameservermanagers.com
-<<<<<<< HEAD
-lgsm_version="190216"
-=======
 lgsm_version="270216"
->>>>>>> dlmanage
 
 # Description: Defines all functions to allow download and execution of functions using fn_fetch_function.
 # This function is called first before any other function. Without this file other functions would not load.