3 ms·It just reads through the merge conflict and intelligently resolves it. This is not a problem.by avarun 8mo agoIt just reads through the merge conflict and intelligently resolves it. This is not a problem.