A tutorial on resolving basic merge conflicts.