Hey, looks like git is retarded afterall!

I hope I've fixed the mess now...