eff rebase conflicts