Attempt to fix git problems