diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index fdc89fc81..34eb53c8a 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -414,13 +414,6 @@
 \n 
 \n프로필 URL을 찾으시려면 다음 과정을 따라해 주세요.
 \n
-<<<<<<< HEAD
-\n만약 모르신다면, 다음을 참고하세요:
-\n
-\n1. 모바일 환경이시면 브라우저 설정에서 데스크탑 모드를 활성화해주세요. Chrome 모바일에서는 오른쪽 … 클릭시 아래쪽에 있습니다.
-=======
-\n1. 모바일 환경이시면 브라우저 설정에서 데스크탑 모드를 활성화해주세요. Chrome 모바일에서는 오른쪽 ... 클릭시 아래쪽에 있습니다. 
->>>>>>> 7508f9d3bbf9c5d3485134e1777eb8ef12cb0943
 \n2. 이 주소로 가세요: %1$s 
 \n3. 로그인이 필요하면 하세요. 
 \n4. 리디렉트된 곳의 URL을 복사하세요. (이 URL이 당신의 프로필 URL 입니다)</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 53e6c3f0a..32a361205 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -23,23 +23,12 @@
     <string name="show_play_with_kodi_title">\"Afspelen met Kodi\"-optie tonen</string>
     <string name="show_play_with_kodi_summary">Toont een optie om een video af te spelen op een Kodi-mediastation</string>
     <string name="play_audio">Audio</string>
-<<<<<<< HEAD
     <string name="default_audio_format_title">Standaardaudioformaat</string>
     <string name="download_dialog_title">Downloaden</string>
     <string name="next_video_title">Volgende video</string>
     <string name="url_not_supported_toast">URL wordt niet ondersteund</string>
     <string name="show_next_and_similar_title">‘volgende’ en ‘vergelijkbare’ video’s weergeven</string>
     <string name="content_language_title">Standaardtaal voor inhoud</string>
-=======
-    <string name="default_audio_format_title">Standaard audioformaat</string>
-    <string name="webm_description">WebM — vrij formaat</string>
-    <string name="m4a_description">M4A — betere kwaliteit</string>
-    <string name="download_dialog_title">Downloaden</string>
-    <string name="next_video_title">Volgende video</string>
-    <string name="url_not_supported_toast">URL wordt niet ondersteund</string>
-    <string name="show_next_and_similar_title">‘volgende’ en ‘vergelijkbare’ video’s tonen</string>
-    <string name="search_language_title">Standaard inhoudstaal</string>
->>>>>>> 7508f9d3bbf9c5d3485134e1777eb8ef12cb0943
     <string name="use_external_video_player_title">Externe videospeler gebruiken</string>
     <string name="use_external_audio_player_title">Externe audiospeler gebruiken</string>
     <string name="settings_category_video_audio_title">Audio en video</string>