fix some merge conflicts