Sorry, I got very confused. Those "bad" merges were indeed fine and were new...

Sorry, I got very confused. Those "bad" merges were indeed fine and were new to this branch. Added them back in.