Add merge conflict section to MySQL tutorial.
Finish merge section of MySQL tutorial.