diff --git a/meson.build b/meson.build
index 07a5e94..8fea647 100644
--- a/meson.build
+++ b/meson.build
@@ -1,6 +1,5 @@
 project('cthulhu',
   version: '2026.01.07-master',
->>>>>>> testing
   meson_version: '>= 1.0.0',
 )