git resolve diverged branches