actually merge conflicts