Ogre was too special
Merge