Merge conflicts

build.gradle

@@ -1,11 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-<<<<<<< HEAD
     ext.kotlin_version = '1.3.50'
-=======
-    ext.kotlin_version = '1.3.41'
->>>>>>> origin/development
     repositories {
         google()
         jcenter()
@@ -14,7 +10,6 @@ buildscript {
         }
     }
     dependencies {
-<<<<<<< HEAD
         classpath 'com.android.tools.build:gradle:3.5.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.kotlin:kotlin-android-extensions:$kotlin_version"
@@ -24,17 +19,6 @@ buildscript {
         // in the individual module build.gradle files
         classpath 'io.fabric.tools:gradle:1.29.0'
         classpath 'com.google.firebase:perf-plugin:1.3.1'
-=======
-        classpath 'com.android.tools.build:gradle:3.4.2'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath "org.jetbrains.kotlin:kotlin-android-extensions:$kotlin_version"
-        classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
-        classpath 'com.google.gms:google-services:4.3.0'
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
-        classpath 'io.fabric.tools:gradle:1.29.0'
-        classpath 'com.google.firebase:perf-plugin:1.3.0'
->>>>>>> origin/development
     }
 }