Fixed the merge apocalypse.