fixing strings.xml merge conflict