diff --git a/resources/printers/version.txt b/resources/printers/version.txt
index 49589e8c68..b7c8d86711 100644
--- a/resources/printers/version.txt
+++ b/resources/printers/version.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD   (29536a NEW:add helio file to translate list)
-02.00.00.26
-=======
-02.00.00.29
->>>>>>> CHANGE (5fa0cb FIX: check close chamber temperature)
+02.00.00.29
\ No newline at end of file