git pull rebase resolve conflicts