add docs
conflict handling