diff --git a/mc-install.sh b/mc-install.sh
index 73630a7..69448fe 100755
--- a/mc-install.sh
+++ b/mc-install.sh
@@ -94,13 +94,8 @@ elif [[ "$maxRam" =~ ("G"|"M") ]]; then
 	printf "\n+ Allocating $maxRam as RAM maximum."
 	echo "-Xmx$maxRam" >> /opt/minecraft/user_jvm_args.txt
 elif [[ -z $maxRam ]]; then
-<<<<<<< HEAD
 	printf "\n+ Allocating $MaxRam as RAM maximum"
 	echo "-Xmx4G" >> user_jvm_args.txt
-=======
-	printf "\n+ Allocating $MaxRam as RAM maximum"
-	echo "-Xmx4G" >> /opt/minecraft/user_jvm_args.txt
->>>>>>> refs/remotes/origin/life2
 elif [[ ! "$maxRam" =~ ("G"|"MB") ]]; then
 	printf "\n+ Allocating ${maxRam}G as RAM maximum"
 	echo "-Xmx${maxRam}G" >> /opt/minecraft/user_jvm_args.txt
@@ -117,13 +112,8 @@ elif [[ "$minRam" =~ ("G"|"M") ]]; then
 	printf "\n+ Allocating $minRam as RAM minimum."
 	echo "-Xms$minRam" >> /opt/minecraft/user_jvm_args.txt
 elif [[ -z $minRam ]]; then
-<<<<<<< HEAD
-	printf "\n+ Allocating $minRam as RAM minimum"
-	echo "-Xms1G" >> user_jvm_args.txt
-=======
 	printf "\n+ Allocating $minRam as RAM minimum"
 	echo "-Xms1G" >> /opt/minecraft/user_jvm_args.txt
->>>>>>> refs/remotes/origin/life2
 elif [[ ! "$minRam" =~ ("G"|"MB") ]]; then
 	printf "Allocating ${minRam}G as RAM maximum"
 	echo "-Xms${minRam}G" >> /opt/minecraft/user_jvm_args.txt