diff --git a/Makefile.common b/Makefile.common
index 6325cbc..5931e99 100755
--- a/Makefile.common
+++ b/Makefile.common
@@ -50,13 +50,13 @@ endif
 
 # os=Default is meant to be generic unix/linux
 
-<<<<<<< HEAD
 # To support new CPU architecture, add a new target name here
 known_os_archs := Linux-x86 Linux-x86_64 Linux-arm Linux-armv6 Linux-armv7 Linux-android-arm Linux-android-aarch64 Linux-aarch64 \
 Linux-ppc Linux-ppc64 Linux-ppc64le Linux-s390 Linux-s390x \
 Mac-x86 Mac-x86_64 Mac-aarch64 FreeBSD-x86_64 \
 Windows-x86 Windows-x86_64 Windows-aarch64 Windows-armv7 \
 SunOS-x86 SunOS-sparc SunOS-x86_64 AIX-ppc AIX-ppc64 Linux-riscv Linux-riscv64
+
 os_arch := $(OS_NAME)-$(OS_ARCH)
 IBM_JDK_7 := $(findstring IBM, $(shell $(JAVA) -version 2>&1 | grep IBM | grep "JRE 1.7"))