Overview of handling merge conflicts