git branches have diverged