avoid merge conflicts

Author: VinayGuthal

firebase-ai/app/src/main/java/com/google/firebase/quickstart/ai/feature/media/imagen/EditingMode.kt

@@ -0,0 +1,9 @@
+package com.google.firebase.quickstart.ai.feature.media.imagen
+
+enum class EditingMode {
+    GENERATE,
+    INPAINTING,
+    OUTPAINTING,
+    SUBJECT_REFERENCE,
+    STYLE_TRANSFER,
+}

firebase-ai/app/src/main/res/drawable/cat.jpeg

@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M8.71,11.71l2.59,2.59c0.39,0.39 1.02,0.39 1.41,0l2.59,-2.59c0.63,-0.63 0.18,-1.71 -0.71,-1.71H9.41c-0.89,0 -1.33,1.08 -0.7,1.71z"/>
+    
+</vector>