fixed mind show page
solved merge conflict