diff --git a/src/fenrirscreenreader/fenrirVersion.py b/src/fenrirscreenreader/fenrirVersion.py
index e969eab0..7bd17da9 100644
--- a/src/fenrirscreenreader/fenrirVersion.py
+++ b/src/fenrirscreenreader/fenrirVersion.py
@@ -4,10 +4,5 @@
 # Fenrir TTY screen reader
 # By Chrys, Storm Dragon, and contributers.
 
-<<<<<<< HEAD
 version = "2025.03.02"
 codeName = "master"
-=======
-version = "2025.03.02"
-codeName = "testing"
->>>>>>> testing