Fixed string.xml conflict