diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index e96f0eb7e..05cb31a43 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -253,15 +253,6 @@
     <string name="system_account_create_failed" msgid="2248313263003927725">"មិន​អាច​បង្កើត​គណនី​។ សូម​ព្យាយាម​ម្ដងទៀត។"</string>
     <string name="device_admin_label" msgid="3335272972461391415">"អ៊ីមែល"</string>
     <string name="device_admin_description" msgid="4299378570982520839">"បើក​​គោល​ន​យោ​បាយ​សុវត្ថិភាព​ម៉ាស៊ីន​មេ​​ដែល​បាន​បញ្ជាក់​"</string>
-<<<<<<< HEAD
-    <string name="settings_activity_title" msgid="4787565736829092053">"កំណត់"</string>
-    <string name="header_label_general_preferences" msgid="2924944721204930254">"ការ​កំណត់​ទូទៅ"</string>
-    <string name="general_preference_confirm_delete_label" msgid="4635169755738754289">"បញ្ជាក់​មុន​ពេល​លុប"</string>
-    <string name="general_preference_confirm_send_label" msgid="2985557291955796568">"បញ្ជាក់​មុន​ពេល​ផ្ញើ"</string>
-    <string name="more_than_999" msgid="4088200269333058889">"999+"</string>
-    <string name="search_hint" msgid="3491349343647799436">"ស្វែងរក​អ៊ីមែល"</string>
-=======
->>>>>>> 19809304
     <string name="policy_dont_allow_camera" msgid="8821533827628900689">"មិន​អនុញ្ញាត​ឲ្យ​ប្រើ​ម៉ាស៊ីន​ថត​របស់​ឧបករណ៍"</string>
     <string name="policy_require_password" msgid="3556860917024612396">"ត្រូវ​ការ​ពាក្យ​សម្ងាត់​ឧបករណ៍"</string>
     <string name="policy_password_history" msgid="9001177390979112746">"ដាក់កម្រិត​​ប្រើ​​ពាក្យ​សម្ងាត់​ថ្មី​ៗ​ឡើងវិញ"</string>
@@ -275,15 +266,8 @@
     <string name="quick_4" msgid="216066940197616025">"​រៀបចំ​កិច្ច​ប្រជុំ​​​​​ ដើម្បី​ពិភាក្សា​រឿង​នេះ​។"</string>
     <string name="require_manual_sync_message" msgid="7361932179783481686">"បាន​បិទ​ការ​ធ្វើ​សម​កាល​កម្ម​ផ្ទៃ​ខាង​ក្រោយ​សម្រាប់​គណនី​នេះ​​​ខណៈ​ពេល​នៅ​ក្រៅ​ប្រទេស។"</string>
     <string name="confirm_response" msgid="6764021931370809514">"កំពុង​ផ្ញើ​​ការ​ឆ្លើយ​តប..."</string>
-<<<<<<< HEAD
-    <string name="no_conversations" msgid="3785854971159919343">"គ្មាន​សារ។"</string>
-    <string name="imap_name" msgid="1267915719183915252">"IMAP​"</string>
-    <string name="pop3_name" msgid="1235910677527117862">"POP3"</string>
-    <string name="folder_picker_title" msgid="5906275472176731605">"កម្មវិធី​ជ្រើស​ថត"</string>
-=======
     <string name="imap_name" msgid="8285222985908214985">"ផ្ទាល់​ខ្លួន (IMAP​)"</string>
     <string name="pop3_name" msgid="6653484706414263493">"ផ្ទាល់​ខ្លួន (POP3​)"</string>
->>>>>>> 19809304
     <string name="trash_folder_selection_title" msgid="686039558899469073">"ជ្រើស​ថត​ធុង​សំរាម​ម៉ាស៊ីន​​មេ​​សម្រាប់ <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
     <string name="sent_folder_selection_title" msgid="9207482909822072856">"ជ្រើស​​ថត​ធាតុ​បាន​ផ្ញើ​ដោយ​ម៉ាស៊ីន​​មេ​សម្រាប់ <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
     <string name="account_waiting_for_folders_msg" msgid="8848194305692897677">"កំពុង​ផ្ទុក​បញ្ជី​ថត ..."</string>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index 22294bb38..95dd6dd9d 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -252,13 +252,7 @@
     <string name="mailbox_settings_activity_title_with_mailbox" msgid="5547676392298186906">"ຕົວເລືອກການຊິ້ງຂໍ້ມູນ (<xliff:g id="MAILBOXX_NAME">%s</xliff:g>)"</string>
     <string name="mailbox_settings_sync_enabled_label" msgid="7723413381707277856">"ຊິ້ງຂໍ້ມູນໂຟນເດີນີ້"</string>
     <string name="mailbox_settings_sync_enabled_summary" msgid="742233465207750578">"ຂໍ້ຄວາມທັງໝົດ​ຈະຖືກດາວໂຫລດ​ເມື່ອມີການເຊື່ອມຕໍ່​ອິນເຕີເນັດ"</string>
-<<<<<<< HEAD
-    <string name="mailbox_settings_mailbox_sync_window_label" msgid="7027516982341382326">"ຈຳ​ນວນມື້ຂອງເມວທີ່ຕ້ອງຊິ້ງຂໍ້ມູນ"</string>
-    <string name="prefDialogTitle_conversationListIcon" msgid="1302579259733675896">"ຮູບຜູ່ສົ່ງ"</string>
-    <string name="provider_note_live" msgid="4289035326060391547">"ມີແຕ່​ບາງບັນ​ຊີ \"Plus\" ທີ່​ມີ​ການ​ເຂົ້າ​ເຖິງ POP ທີ່ອະນຸຍາດ​ໃຫ້​ໂປຣແກຣມ​ນີ້​ເຊື່ອມຕໍ່. ຫາກ​ທ່ານ​ບໍ່​ສາມາດ​ເຂົ້າສູ່​ລະບົບ​ດ້ວຍ​ທີ່​ຢູ່​ອີເມວ ແລະ​ລະຫັດ​ຜ່ານທີ່​ຖືກຕ້ອງໄດ້, ໝາຍ​ຄວາມ​ວ່າ​ທ່ານອາດບໍ່ມີບັນຊີ \"Plus\" ແບບ​ເສຍ​ເງິນ. ໃຫ້ເປີດ​ໂປຣແກຣມ​ທ່ອງເວັບ​ເພື່ອ​ເຂົ້າເຖິງ​ບັນຊີ​ອີເມວ​ເຫຼົ່ານີ້."</string>
-=======
     <string name="mailbox_settings_mailbox_sync_window_label" msgid="7027516982341382326">"ຈຳນວນ​ມື້​ຂອງ​ອີເມວ​ທີ່​ຕ້ອງການ​ຊິ້ງ​ຂໍ້ມູນ"</string>
->>>>>>> 19809304
     <string name="provider_note_t_online" msgid="1596701148051980218">"ກ່ອນ​ທີ່​ຈະ​ຕິດຕັ້ງ​ບັນ​ຊີ​ອີເມວ, ໃຫ້​ເຂົ້າ​ຊົມເວັບໄຊ T-Online ແລະ ສ້າງ​ລະຫັດ​ຜ່ານ​ສຳລັບ​ການ​ເຂົ້າເຖິງ​ອີເມວ POP3 ກ່ອນ."</string>
     <string name="exchange_name" msgid="3793803477985438102">"ອົງ​ກອນ"</string>
     <string name="exchange_name_alternate" msgid="293118547772095111">"Microsoft Exchange ActiveSync"</string>