Grrr, why does git keep on doing this to me