diff --git a/.gitignore b/.gitignore
index 63322c03..c8b84f72 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,11 +10,4 @@ __pycache__/
 *.before_mother_brain
 *.runtime_backup
 .env.local
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
 guardian_audit.json
->>>>>>> origin/main
-=======
-guardian_audit.json
->>>>>>> origin/main
diff --git a/strategic_intelligence/opportunity_radar.py b/strategic_intelligence/opportunity_radar.py
index e1165d50..0a1094f0 100644
--- a/strategic_intelligence/opportunity_radar.py
+++ b/strategic_intelligence/opportunity_radar.py
@@ -170,75 +170,3 @@ def run(self):
             indent=2
         )
     )
-
-<<<<<<< HEAD
-    def collect(self):
-        return {
-            "economic_signal": "GROWTH",
-            "market_demand": "INCREASING",
-            "supply_risk": "MEDIUM",
-            "consumer_signal": "POSITIVE",
-        }
-
-
-class OpportunityDetector:
-    def analyze(self, signals):
-        opportunities = []
-
-        if signals["market_demand"] == "INCREASING":
-            opportunities.append("EXPAND_HIGH_DEMAND_CATEGORY")
-
-        if signals["supply_risk"] == "MEDIUM":
-            opportunities.append("OPTIMIZE_INVENTORY_BUFFER")
-
-        return {
-            "opportunities": opportunities,
-            "confidence": 94,
-        }
-
-
-class BusinessImpactSimulator:
-    def simulate(self, opportunities):
-        return {
-            "scenario": "STRATEGIC_AI_OPTIMIZATION",
-            "impact": {
-                "revenue_potential": "+15%",
-                "inventory_efficiency": "+20%",
-                "risk_reduction": "+25%",
-            },
-        }
-
-
-class StrategicDecisionEngine:
-    def decide(self, impact):
-        return {
-            "decision": "EXECUTE_STRATEGIC_PLAN",
-            "approval": "GOVERNANCE_CHECKED",
-            "impact": impact,
-        }
-
-
-class OpportunityRadar:
-    def run(self):
-        signals = WorldSignalIntelligence().collect()
-        opportunity = OpportunityDetector().analyze(signals)
-        simulation = BusinessImpactSimulator().simulate(opportunity)
-        decision = StrategicDecisionEngine().decide(simulation)
-
-        return {
-            "system": "AEON MATRIX OPPORTUNITY RADAR",
-            "timestamp": datetime.utcnow().isoformat(),
-            "signals": signals,
-            "opportunity": opportunity,
-            "simulation": simulation,
-            "decision": decision,
-        }
-
-
-if __name__ == "__main__":
-    print("=" * 75)
-    print("AEON MATRIX GLOBAL INTELLIGENCE LAYER")
-    print("=" * 75)
-    print(json.dumps(OpportunityRadar().run(), indent=2))
-=======
->>>>>>> origin/main