merge changes for sub skipChar