diff --git a/SConstruct b/SConstruct
index 335bdde3c..108ff26ba 100644
--- a/SConstruct
+++ b/SConstruct
@@ -327,8 +327,9 @@ firmware_env.Append(
     IMG_LINT_SOURCES=[
         # Image assets
         "applications",
-        "!applications/external",
         "assets",
+        # Avoid merge conflicts
+        "!applications/external",
     ],
 )
 
@@ -346,8 +347,9 @@ black_commandline = [
 black_base_args = [
     "--include",
     '"(\\.scons|\\.py|SConscript|SConstruct|\\.fam)$"',
+    # Avoid merge conflicts
     "--exclude",
-    '"(mp_flipper/(flipperzero|docs)/.*\\.py)$"',
+    '"applications/external"',
 ]
 
 distenv.PhonyTarget(
diff --git a/firmware.scons b/firmware.scons
index 799f9c18a..e53fd8edf 100644
--- a/firmware.scons
+++ b/firmware.scons
@@ -31,16 +31,8 @@ env = ENV.Clone(
         Dir("applications"),
         # Not C code
         Dir("!applications/system/js_app/packages"),
-        # Frequently updated and very different formatting, painful to merge
-        Dir("!applications/external/nfc_playlist"),
-        Dir("!applications/external/flip_library"),
-        Dir("!applications/external/flip_social"),
-        Dir("!applications/external/flip_store"),
-        Dir("!applications/external/flip_trader"),
-        Dir("!applications/external/flip_weather"),
-        Dir("!applications/external/flip_wifi"),
-        Dir("!applications/external/flip_world"),
-        Dir("!applications/external/web_crawler"),
+        # Avoid merge conflicts
+        Dir("!applications/external"),
     ],
     LIBPATH=[
         "${LIB_DIST_DIR}",