diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index d2cc2ad..c0b4858 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -88,7 +88,6 @@ Each branch appends a suffix to indicate stability:
 
 ### Auto version bump
 
-<<<<<<< HEAD
 On every push to `dev`, `feature/*`, or `patch/*`:
 
 1. Patch version incremented
@@ -116,15 +115,6 @@ When a higher-stability release is published, copies are created for all lesser
 
 This ensures Joomla sites on ANY stability channel see the update (Joomla only shows versions higher than what's installed).
 
-=======
-On every push to `dev`, `alpha`, `beta`, `rc`, or `feature/*`:
-
-1. Patch version incremented
-2. Stability suffix applied based on branch name
-3. All version-bearing files updated (manifests, CHANGELOG, PHP headers, etc.)
-4. Commit created with `[skip ci]` to avoid loops
-
->>>>>>> origin/main
 ### Version files
 
 The version tools update all files containing version stamps: