Handling merge conflicts