Deal with merge conflicts directly