Fix conflict doc since there is only `add_conflict` method.
Merge pull request #2394 from take-cheeze/fix_conflict_doc

Fix conflict doc since there is only `add_conflict` method.