Fix git again and again