Merge conflict fix
Fixed merge conflict in strings.xml