diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index a8b0c1ca204..058d941390d 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -941,7 +941,12 @@
     <string name="settings_others_label">ANDERE</string>
     <string name="settings_your_account_label">Kontodetails</string>
     <string name="settings_app_settings_label">App-Einstellungen</string>
+<<<<<<< HEAD
     <string name="settings_privacy_settings_label">Datenschutzeinstellungen</string>
+=======
+    <string name="settings_privacy_policy_label">Datenschutzerklärung</string>
+    <string name="settings_terms_of_use_label">Datenschutz und AGB</string>
+>>>>>>> fd519ad52 (fix: cherrypick terms of use copy (WPB-8846) 🍒 (#3155))
     <string name="settings_network_settings_label">Netzwerkeinstellungen</string>
     <string name="settings_manage_devices_label">Geräte verwalten</string>
     <string name="settings_keep_connection_to_websocket">Verbindung zu Websocket behalten</string>