@allisons @jessitron doesn’t always fix a busted m…

@allisons @jessitron doesn’t always fix a busted merge. I speak from experience.