diff --git a/prowler/providers/aws/services/networkfirewall/networkfirewall_in_all_vpc/networkfirewall_in_all_vpc.metadata.json b/prowler/providers/aws/services/networkfirewall/networkfirewall_in_all_vpc/networkfirewall_in_all_vpc.metadata.json
index 98390d0cab..f0a67cd520 100644
--- a/prowler/providers/aws/services/networkfirewall/networkfirewall_in_all_vpc/networkfirewall_in_all_vpc.metadata.json
+++ b/prowler/providers/aws/services/networkfirewall/networkfirewall_in_all_vpc/networkfirewall_in_all_vpc.metadata.json
@@ -23,13 +23,9 @@
       "Url": "https://docs.aws.amazon.com/network-firewall/latest/developerguide/vpc-config.html"
     }
   },
-<<<<<<< HEAD
-  "Categories": [],
-=======
   "Categories": [
     "trust-boundaries"
   ],
->>>>>>> 01fe379b5 (fix: remove incorrect `threat-detection` category from checks (#9489))
   "DependsOn": [],
   "RelatedTo": [],
   "Notes": ""