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