修复pratice lesson失败但是没办法下一步的bug
fix .gitignore conflict
fix conflict
fix cannot show the navigator bar bug