Fixed conflict, added Meny