diff --git a/RELEASE.md b/RELEASE.md
index 2665855c..ebda8dc0 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -1,6 +1,5 @@
 # Release notes
 
-<<<<<<< HEAD
 ## Next
 
 ### API Changes:
@@ -15,8 +14,6 @@
 
 ### Bugfixes:
 - Fixed broken reading of old (pre reordering) Moench03
-=======
->>>>>>> c718a4a (updated release notes)
 
 ## 2026.7.2