merge archimedes ns into ogre ns