Committing strings.xml
Merge?