fix some bugs with last merge conflicts