diff --git a/mifosng-provider/gradle.properties b/mifosng-provider/gradle.properties
index 39e7b9f7f..9b500178d 100644
--- a/mifosng-provider/gradle.properties
+++ b/mifosng-provider/gradle.properties
@@ -1,5 +1,2 @@
-<<<<<<< HEAD
 releaseVersion=1.8.0.DEVELOP
-=======
-releaseVersion=1.7.1.RELEASE
->>>>>>> master
+