fix merge issues

android/app/build.gradle

@@ -74,7 +74,7 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation "com.google.firebase:firebase-messaging:20.3.0"
     implementation 'pub.devrel:easypermissions:0.4.0'
-    implementation 'com.google.firebase:firebase-inappmessaging-display:17.2.0'
+   // implementation 'com.google.firebase:firebase-inappmessaging-display:17.2.0'
     implementation 'com.google.guava:guava:27.0.1-android'
     // Dependency on local binaries
     implementation fileTree(dir: 'libs', include: ['*.jar'])

android/gradle.properties

@@ -1,5 +1,4 @@
-
+org.gradle.jvmargs=-Xmx1536M
 android.enableR8=true
 android.useAndroidX=true
 android.enableJetifier=true
-org.gradle.jvmargs=-Xmx4608m