diff --git a/res/values/strings_ko.arb b/res/values/strings_ko.arb
index 146b23058..279a81ace 100644
--- a/res/values/strings_ko.arb
+++ b/res/values/strings_ko.arb
@@ -339,5 +339,9 @@
   "incorrect_seed" : "입력하신 텍스트가 유효하지 않습니다.",
 
   "biometric_auth_reason" : "지문을 스캔하여 인증",
+<<<<<<< HEAD
+=======
+
+>>>>>>> 4848485be8cbc34cbec847abbb76dabd075841ae
   "version" : "버전 ${currentVersion}"
 }
\ No newline at end of file