Update tutorial about basic merge conflicts.