diff --git a/frontend/src/components/threatactor/ThreatActorDetailed/ThreatActorAssociated/ThreatActorAssociatedList.tsx b/frontend/src/components/threatactor/ThreatActorDetailed/ThreatActorAssociated/ThreatActorAssociatedList.tsx
index 635edff..e83a091 100644
--- a/frontend/src/components/threatactor/ThreatActorDetailed/ThreatActorAssociated/ThreatActorAssociatedList.tsx
+++ b/frontend/src/components/threatactor/ThreatActorDetailed/ThreatActorAssociated/ThreatActorAssociatedList.tsx
@@ -6,11 +6,8 @@ import {
 } from "lucide-react";
 import type { AssociatedItem } from "../../../../types/ThreatActorTypes";
 import "./ThreatActorAssociatedList.css";
-<<<<<<< HEAD
 import FeedbackCard from "../../../feedback/FeedbackCard";
-=======
 import { Link } from "react-router-dom";
->>>>>>> e54f807 (feat: add dynamic back navigation across detail pages)
 
 type ThreatActorAssociatedListProps = {
   type: "techniques" | "software";