diff --git a/app/build.gradle b/app/build.gradle
index 25b2d7a66..e0ff26968 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -38,13 +38,8 @@ android {
         targetSdkVersion 28
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
-<<<<<<< HEAD
         versionCode 107
         versionName "6.2.0"
-=======
-        versionCode 108
-        versionName "6.1.6"
->>>>>>> cde40d6e... Better cleanup
 
         flavorDimensions "default"
         renderscriptTargetApi 19