Add a section on Merge conflicts

U.Mattschasrequested to merge
branch_conflict into master

same same but different

Merge request reports