diff --git a/meson.build b/meson.build
index bc765b6..9dcd9f8 100644
--- a/meson.build
+++ b/meson.build
@@ -1,9 +1,5 @@
 project('cthulhu',
-<<<<<<< HEAD
   version: '2025.12.30-master',
-=======
-  version: '2025.12.30-master',
->>>>>>> testing
   meson_version: '>= 1.0.0',
 )