styled show page
fixed merge conflict