Handle merge conflicts