c95aefe Fix broken links and formatting in Conflicts.adoc

Authored and Committed by didiksupriadi41 2 years ago
    Fix broken links and formatting in Conflicts.adoc