Fixing strings.xml conflict