diff --git a/simple-backup b/simple-backup
index 5dd24db..881c22f 100755
--- a/simple-backup
+++ b/simple-backup
@@ -19,11 +19,7 @@
 
 #Help function
 function help_function {
-<<<<<<< HEAD
-   echo "simple_backup, version 1.3.4"
-=======
    echo "simple_backup, version 1.4"
->>>>>>> development
    echo ""
    echo "Usage: $0 [OPTIONS]"
    echo ""