9. Handling merge conflicts