Fixing schema git problems