diff --git a/package.json b/package.json
index 666bd32066..bd1ccd9d8f 100644
--- a/package.json
+++ b/package.json
@@ -1,10 +1,6 @@
 {
   "name": "CherryStudio",
-<<<<<<< HEAD
-  "version": "1.7.0-alpha.4",
-=======
-  "version": "1.6.3",
->>>>>>> main
+  "version": "1.7.0-alpha.5",
   "private": true,
   "description": "A powerful AI assistant for producer.",
   "main": "./out/main/index.js",
diff --git a/src/renderer/src/i18n/translate/el-gr.json b/src/renderer/src/i18n/translate/el-gr.json
index 86c83a8f45..37ab5c391d 100644
--- a/src/renderer/src/i18n/translate/el-gr.json
+++ b/src/renderer/src/i18n/translate/el-gr.json
@@ -532,11 +532,7 @@
       "new_topic": "Νέο θέμα {{Command}}",
       "pause": "Παύση",
       "placeholder": "Εισάγετε μήνυμα εδώ...",
-<<<<<<< HEAD
       "placeholder_without_triggers": "Γράψτε το μήνυμά σας εδώ, πατήστε {{key}} για αποστολή",
-=======
-      "placeholder_without_triggers": "Εδώ εισαγάγετε το μήνυμα, πατήστε {{key}} για αποστολή",
->>>>>>> main
       "send": "Αποστολή",
       "settings": "Ρυθμίσεις",
       "thinking": {
diff --git a/src/renderer/src/i18n/translate/es-es.json b/src/renderer/src/i18n/translate/es-es.json
index da4e390fac..27879fd08a 100644
--- a/src/renderer/src/i18n/translate/es-es.json
+++ b/src/renderer/src/i18n/translate/es-es.json
@@ -532,11 +532,7 @@
       "new_topic": "Nuevo tema {{Command}}",
       "pause": "Pausar",
       "placeholder": "Escribe aquí tu mensaje...",
-<<<<<<< HEAD
       "placeholder_without_triggers": "Escribe tu mensaje aquí, presiona {{key}} para enviar",
-=======
-      "placeholder_without_triggers": "Escriba un mensaje aquí y presione {{key}} para enviar",
->>>>>>> main
       "send": "Enviar",
       "settings": "Configuración",
       "thinking": {
diff --git a/src/renderer/src/i18n/translate/fr-fr.json b/src/renderer/src/i18n/translate/fr-fr.json
index 66b56c99e5..2abd44d4fa 100644
--- a/src/renderer/src/i18n/translate/fr-fr.json
+++ b/src/renderer/src/i18n/translate/fr-fr.json
@@ -532,11 +532,7 @@
       "new_topic": "Nouveau sujet {{Command}}",
       "pause": "Pause",
       "placeholder": "Entrez votre message ici...",
-<<<<<<< HEAD
       "placeholder_without_triggers": "Tapez votre message ici, appuyez sur {{key}} pour envoyer",
-=======
-      "placeholder_without_triggers": "Entrez votre message ici, appuyez sur {{key}} pour envoyer",
->>>>>>> main
       "send": "Envoyer",
       "settings": "Paramètres",
       "thinking": {
diff --git a/src/renderer/src/i18n/translate/ja-jp.json b/src/renderer/src/i18n/translate/ja-jp.json
index d6339060b9..5f30e21c75 100644
--- a/src/renderer/src/i18n/translate/ja-jp.json
+++ b/src/renderer/src/i18n/translate/ja-jp.json
@@ -532,11 +532,7 @@
       "new_topic": "新しいトピック {{Command}}",
       "pause": "一時停止",
       "placeholder": "ここにメッセージを入力し、{{key}} を押して送信...",
-<<<<<<< HEAD
       "placeholder_without_triggers": "ここにメッセージを入力し、{{key}} を押して送信...",
-=======
-      "placeholder_without_triggers": "ここにメッセージを入力し、{{key}} を押して送信してください",
->>>>>>> main
       "send": "送信",
       "settings": "設定",
       "thinking": {
diff --git a/src/renderer/src/i18n/translate/pt-pt.json b/src/renderer/src/i18n/translate/pt-pt.json
index 4df2343867..e9f3a4c661 100644
--- a/src/renderer/src/i18n/translate/pt-pt.json
+++ b/src/renderer/src/i18n/translate/pt-pt.json
@@ -532,11 +532,7 @@
       "new_topic": "Novo tópico {{Command}}",
       "pause": "Pausar",
       "placeholder": "Digite sua mensagem aqui...",
-<<<<<<< HEAD
       "placeholder_without_triggers": "Escreve a tua mensagem aqui, pressiona {{key}} para enviar",
-=======
-      "placeholder_without_triggers": "Digite a mensagem aqui, pressione {{key}} para enviar",
->>>>>>> main
       "send": "Enviar",
       "settings": "Configurações",
       "thinking": {
diff --git a/src/renderer/src/i18n/translate/ru-ru.json b/src/renderer/src/i18n/translate/ru-ru.json
index 63cb132b08..755c06c636 100644
--- a/src/renderer/src/i18n/translate/ru-ru.json
+++ b/src/renderer/src/i18n/translate/ru-ru.json
@@ -532,11 +532,7 @@
       "new_topic": "Новый топик {{Command}}",
       "pause": "Остановить",
       "placeholder": "Введите ваше сообщение здесь, нажмите {{key}} для отправки...",
-<<<<<<< HEAD
       "placeholder_without_triggers": "Напишите сообщение здесь, нажмите {{key}} для отправки",
-=======
-      "placeholder_without_triggers": "Введите сообщение здесь, нажмите {{key}}, чтобы отправить",
->>>>>>> main
       "send": "Отправить",
       "settings": "Настройки",
       "thinking": {