edit merge conflicts