diff --git a/resources/printers/version.txt b/resources/printers/version.txt
index 070b9064f..f86cbb485 100644
--- a/resources/printers/version.txt
+++ b/resources/printers/version.txt
@@ -1,5 +1 @@
-<<<<<<< HEAD   (9f2e21 FIX: protect the EndModal functions while top dialog is not )
-02.00.00.14
-=======
-02.00.00.17
->>>>>>> CHANGE (04056a ENH: update temperature limit for all printer)
+02.00.00.17
\ No newline at end of file