add plan page
fix conflict