diff --git a/.ci.yaml b/.ci.yaml
old mode 100644
new mode 100755
index 46dea3b..1703be6
--- a/.ci.yaml
+++ b/.ci.yaml
@@ -1548,9 +1548,16 @@
       - packages/flutter_tools/**
       - bin/**
 
+<<<<<<< HEAD
   - name: Mac tool_integration_tests_2_4
     recipe: flutter/flutter_drone
     timeout: 60
+=======
+  - name: Linux_android flutter_gallery__memory_nav
+    builder: Linux_android flutter_gallery__memory_nav
+    bringup: true # Flaky https://github.com/flutter/flutter/issues/87492
+    presubmit: false
+>>>>>>> 6c2f2f7f69 (Marks Linux_android flutter_gallery__memory_nav to be flaky)
     properties:
       add_recipes_cq: "true"
       shard: tool_integration_tests