trivia styled
resolved conflict