merge changes for seperator change