git pull remote branch diverged