Fix conflict in strings

app/src/main/res/values/strings.xml

@@ -31,13 +31,10 @@
     <string name="launch_report">Launch Report</string>
     <string name="progress">Progress</string>
     <string name="save_report">Save Report</string>
-<<<<<<< HEAD
     <string name="import_confirmation">Do you want to proceed with the file import?</string>
-=======
     <string name="update_entity" formatted="false">Update %s</string>
     <string name="comparison_chart">Comparison chart</string>
     <string name="filter_currently_selected">The filter cannot be deleted because it is currently selected.</string>
->>>>>>> 5d02ab88722ad9a85d1b7d57dac44a54369a9b74
 
     <string name="address">Address</string>
     <string name="suggestions">Naming suggestions</string>