Of course git had to screw things up again