adding answer options back from conflict merge solution