Resolved Strings.xml conflict