Try to resolve some git silliness