Fix aftermerge bug: duplicate resources in strings.xml