fix conflict on show page