Fixed errors brought by merging Garret and My String.xml