diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b8231019..73666f07 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -11,11 +11,6 @@
     <string name="initial_value">Initial Value</string>
     <string name="less_then_2_values_for_display">Can\'t show because there is less than two values to display!</string>
     <string name="invalid_object">The object you\'re trying to access is invalid</string>
-<<<<<<< HEAD
-
-    <!--<string name="default_error_message">Sorry, something went wrong...please contact us!</string>-->
-=======
->>>>>>> dev
 
     <string name="address">Address</string>
     <string name="suggestions">Naming suggestions</string>