Fixed merge conflict in istring.c