Trying to un-bork a funky merge situation