diff --git a/INT69DB_2A/Version.txt b/INT69DB_2A/Version.txt
index 0794459..d8f059a 100644
--- a/INT69DB_2A/Version.txt
+++ b/INT69DB_2A/Version.txt
@@ -15,7 +15,6 @@
 	¸ÖƼÇü 2~6¿­ ½ºÆ½ °è·®±â
 */
 
-<<<<<<< HEAD
 @ Ver 6.6.0 by CJY
 	- 2025.09.29
 	- Ver 6.5.0 Modify
@@ -70,8 +69,11 @@
 	        temp = 12 -> 20 ¼öÁ¤
 	  ¼Óµµ µ¥ÀÌÅÍ°¡ Ãß°¡ µÇ¾îÀÖ´Ù°íÇÔ(½ÇÁ¦·Î´Â -99990000 À̰Ÿ¸ ¼ö½ÅµÊ..)
 
+<<<<<<< HEAD
 =======
 >>>>>>> 875d61f (@ Ver 6.1.0 by LSJ)
+=======
+>>>>>>> e80d5a7 (@ Ver 6.1.1 by LSJ)
 @ Ver 6.1.0 by LSJ
 	- 2024.12.05
 	- Ver 6.0.0 Modify