git pull have diverged