rebase with 4 merge conflicts