settle merge conflicts