diff --git a/build.gradle b/build.gradle
index 9f9a47c..952ae7d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,11 +6,8 @@ plugins {
 }
 
 group = "org.bdware.sc"
-<<<<<<< HEAD
 version = "2.0.0"
-=======
-version = "1.7.2"
->>>>>>> origin/master
+
 repositories {
     mavenCentral()
     mavenLocal()