diff --git a/app/build.gradle b/app/build.gradle
index c127868b9..f7af72968 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,13 +8,8 @@ android {
         applicationId "org.schabi.newpipe"
         minSdkVersion 15
         targetSdkVersion 26
-<<<<<<< HEAD
-        versionCode 40
-        versionName "0.10.2"
-=======
         versionCode 41
         versionName "0.11.0"
->>>>>>> dev
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true