diff --git a/Makefile.cfg b/Makefile.cfg
index ea9473b0220788fc8eaeea5a710c7c7c9b6e40a4..f1f38d454ed55588d0771df9897c0d2a8e01cad1 100644
--- a/Makefile.cfg
+++ b/Makefile.cfg
@@ -88,11 +88,7 @@ JNI := yes
 
 # Path of the Java Developement Kit installation
 # (must be at least version  1.5.0_10)
-<<<<<<< HEAD
 JDKDIR := /usr/lib/jvm/default-java
-=======
-JDKDIR := /usr/lib/jvm/default-java 
->>>>>>> 4a0c4186d3c98f51d0735e21cca5918568a7082b
 
 # Path of OpenSSL installation: (always required)
 OPENSSL_DIR := default