Removed reference to mm.navigation.js
Fixed merge conflict in mm.js