diff --git a/app/build.gradle b/app/build.gradle
index 39c73ec..0e9fc6b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -37,11 +37,7 @@
         applicationId "nl.digital_me.dummyandroidapp"
         minSdkVersion 14
         targetSdkVersion rootProject.ext.compileSdkVersion
-<<<<<<< HEAD
-        versionCode project.hasProperty('versionCode') ? project.property('versionCode') as int : 55
-=======
         versionCode project.hasProperty('versionCode') ? project.property('versionCode') as int : 58
->>>>>>> refs/remotes/origin/master
         versionName project.hasProperty('versionName') ? project.property('versionName') : "0.0.5"
         multiDexEnabled true
     }