Fixed merge conflicts in maze_navigator