whatever
fixed merge conflict in strings.xml