Added link to merge conflict resolution page.