merge removing skipstrcmp