git rebase resolve conflicts automatically