It just reads through the merge conflict and intelligently resolves it. This is not a problem.

Same way everyone else does it. You can't abstract away the underlying problem.