diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
index 005b8d2..688a442 100644
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 # SPDX-License-Identifier: MPL-2.0
-=======
-# SPDX-License-Identifier: MPL-2.0
->>>>>>> 1b58383 (chore: sync from parent repo automation)
 # Funding platforms for hyperpolymath projects
 # See: https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/displaying-a-sponsor-button-in-your-repository
 
diff --git a/.github/workflows/instant-sync.yml b/.github/workflows/instant-sync.yml
index 14fe65e..01646a7 100644
--- a/.github/workflows/instant-sync.yml
+++ b/.github/workflows/instant-sync.yml
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 # SPDX-License-Identifier: MPL-2.0
-=======
-# SPDX-License-Identifier: MPL-2.0
->>>>>>> 1b58383 (chore: sync from parent repo automation)
 # Instant Forge Sync - Triggers propagation to all forges on push/release
 name: Instant Sync
 
diff --git a/.github/workflows/semgrep.yml b/.github/workflows/semgrep.yml
index 85a9205..1b23d11 100644
--- a/.github/workflows/semgrep.yml
+++ b/.github/workflows/semgrep.yml
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 # SPDX-License-Identifier: MPL-2.0
-=======
-# SPDX-License-Identifier: MPL-2.0
->>>>>>> 1b58383 (chore: sync from parent repo automation)
 name: Semgrep SAST
 
 on: