how to fix the 'your branch have diverged' message