implementing basic conflict handling