set the Ogre's mass as ten
igore project's file
remove conflict