diff --git a/make.sh b/make.sh
index b4d5ea7a3..d015dd95a 100755
--- a/make.sh
+++ b/make.sh
@@ -24,7 +24,6 @@
 
 NAME="IPFire"							# Software name
 SNAME="ipfire"							# Short name
-<<<<<<< HEAD
 VERSION="2.23"							# Version number
 CORE="131"							# Core Level (Filename)
 PAKFIRE_CORE="130"						# Core Level (PAKFIRE)