Merge conflicts

in Hilarity