Strings.xml conflict solved