fixed merge error in strings

Change-Id: Ib30f58cbeb384a10de507a8d481ecdd4fcfb0a10