solve some merge conflicts