Fix what git broke