Deleted my version of istring.c
Fixed merge cnoflict