Complete 2 sections about merge with conflicts

Complete sections about 3-way merge and the rebase way. Also add a figure
comparing ff and no-ff merges in the last section.