Git Your Branch Have Diverged Fix