Add conflict handling into demo