resovled merge conflict

fastlane/Fastfile

@@ -50,15 +50,19 @@ platform :android do
 
   desc "build the apk"
   lane :build do
-    gradle(task: "bundleRelease")
-    # gradle(task: "clean assembleDebug")
+    gradle(task: "clean assembleDebug")
     # gradle(task: "clean assembleRelease")
   end
 
-  desc "Deploy a new version to the Google Play - Alpha Track"
-    lane :deployToPlaystoreAlpha do
-      gradle(task: "bundleRelease")
+  desc "Deploy a new version to the Google Play"
+  lane :deploy do
+    # gradle(task: "clean assembleRelease")
+    # upload_to_play_store
+  end
 
+  desc "Deploy a new version to the Google Play - Alpha"
+    lane :deployToplay do
+      gradle(task: "clean assembleDebug")
       upload_to_google_play(
        track: "alpha",
       json_key: "/home/karthik_shetty_niveussolutions_c/prj-common-services-01-0c9b948542c2.json",

fastlane/Pluginfile

@@ -4,4 +4,4 @@
 
 gem 'fastlane-plugin-load_json'
 gem 'fastlane-plugin-firebase_app_distribution'
-gem 'fastlane-plugin-upload_to_google_play'
+gem 'fastlane-plugin-upload_to_play_store'