Add document for `add_conflict` and `add_conflicts`.
Add :doc task to run document generator.
Update document by regenerating it.
update add_confict document; ref #2391
git push origin masterMerge branch 'take-cheeze-conflict_doc'
Merge pull request #2392 from take-cheeze/doc_update

Update document and add :doc task.