Moved conflict handling to conclusion