final jeopardy round display
merged conflicts