git rebase resolve conflicts manually