Add answer collector
Fix merge conflicts