diff --git a/parts.rst b/parts.rst
index f99a2ea..9b0146b 100644
--- a/parts.rst
+++ b/parts.rst
@@ -1225,8 +1225,6 @@ to ensure the compiler is suitable for downstream consumption;
 * LTO now fully functions correctly, despite both the linker and the compiler
   being static binaries.
 
-<<<<<<< HEAD
-<<<<<<< HEAD
 libmd 1.1.0
 ===========