add comments about conflict handling