removed HEAD merge in strings.xml