Merged code

merged strings.xml