show page edit
fixed merge conflict