Add page on handling merge conflicts
Fix link to pages/merge_conflicts.html
Add missing word