fix file after merge

.X

 Changes to be committed:
	modified:   res/values/strings.xml