Fixed merge conflict

Co-authored-by: Mohammed Anas <triallax@tutanota.com>

app/build.gradle

@@ -14,8 +14,8 @@ android {
     defaultConfig {
         applicationId "org.schabi.newpipe"
         resValue "string", "app_name", "NewPipe"
-        minSdkVersion 19
-        targetSdkVersion 29
+        minSdk 19
+        targetSdk 29
         versionCode 982
         versionName "0.21.16"