applied recent changes to 2.0
RDoc-127. Add Link From Handling Conflicts To Document Conflict listener Documentation