Add document for `add_conflict` and `add_conflicts`.
update add_confict document; ref #2391
git push origin masterMerge branch 'take-cheeze-conflict_doc'