diff --git a/res/values/strings.xml b/res/values/strings.xml
index 670d6c7..b151506 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -3,22 +3,10 @@
 
     <string name="app_name">Lightning</string>
     <string name="google">Google</string>
-    <string name="settings">Paramètres</string>
-    <string name="location">Autoriser les sites à accéder à ma position</string>
-    <string name="password">Enregistrer les mots de passe</string>
+    <string name="settings">Browser Settings</string>
+    <string name="location">Allow sites to access your location</string>
+    <string name="password">Save your passwords</string>
     <string name="agent">User Agent</string>
-<<<<<<< HEAD
-    <string name="history">Effacer l\'historique à la sortie (le cache sera vidé)</string>
-    <string name="email">Contactez moi</string>
-    <string name="flash">Activer Adobe Flash Player (s\'il est installé)</string>
-    <string name="mobile">Voir la version Mobile</string>
-    <string name="desk">Voir la version Ordinateur</string>
-    <string name="custom">Utiliser un User Agent personnalisé</string>
-    <string name="home">Au démarrage</string>
-    <string name="settingshelp">Les paramètres ne s\'appliquerons qu\'au nouveaux onglets</string>
-    <string name="fullscreen">Activer le mode plein écran</string>
-    <string name="java">Activer JavaScript</string>
-=======
     <string name="history">Clear history on exit</string>
     <string name="email">Email me</string>
     <string name="flash">Enable Adobe Flash (if it\'s installed)</string>
@@ -29,6 +17,5 @@
     <string name="settingshelp">Settings only apply to new tabs</string>
     <string name="fullscreen">Enable fullscreen mode</string>
     <string name="java">Enable JavaScript</string>
->>>>>>> 2.3.0 changes added see below
 
 </resources>