diff --git a/src/com/android/launcher3/model/FirstScreenBroadcast.java b/src/com/android/launcher3/model/FirstScreenBroadcast.java
index 18ce0358bb..5112304fb8 100644
--- a/src/com/android/launcher3/model/FirstScreenBroadcast.java
+++ b/src/com/android/launcher3/model/FirstScreenBroadcast.java
@@ -15,18 +15,7 @@
  */
 package com.android.launcher3.model;
 
-<<<<<<< TARGET BRANCH (878601 Block recent work profile apps content capture)
 import static android.os.Process.myUserHandle;
-=======
-import static android.app.PendingIntent.FLAG_IMMUTABLE;
-import static android.app.PendingIntent.FLAG_ONE_SHOT;
-import static android.os.Process.myUserHandle;
-
-import static com.android.launcher3.pm.InstallSessionHelper.getUserHandle;
-
-import static java.util.stream.Collectors.groupingBy;
-import static java.util.stream.Collectors.mapping;
->>>>>>> SOURCE BRANCH (578578 Set FLAG_IMMUTABLE flag on FirstScreenBroadcast PendingInten)
 
 import android.app.PendingIntent;
 import android.content.Context;
@@ -156,7 +145,7 @@ public class FirstScreenBroadcast {
                 .putStringArrayListExtra(HOTSEAT_ITEM_EXTRA, new ArrayList<>(hotseatItems))
                 .putStringArrayListExtra(WIDGET_ITEM_EXTRA, new ArrayList<>(widgetItems))
                 .putExtra(VERIFICATION_TOKEN_EXTRA, PendingIntent.getActivity(context, 0,
-                        new Intent(), FLAG_ONE_SHOT | FLAG_IMMUTABLE)));
+                        new Intent(), PendingIntent.FLAG_ONE_SHOT)));
     }
 
     private static String getPackageName(ItemInfo info) {