[FIX] FIX git problems