Git marked that conflict up very poorly.

For some reason git only marked about half of that conflict and I
missed the one extra preprocessor endif some 30 or so lines outside
the markers lol.