git fix diverged branches