modify show page
fixed conflict error