Git really hates me...