Fixed Conflicts

Strings.xml conflict fixed