Comment 4 for bug 1888659

@vultaire It does - in such cases there's a conflicts indicator near the top of the MP, in the drop-down list of files affected.

@xavpaice Marking MPs as "needs fixing" in such cases seems perfectly appropriate, since they do in fact need fixing (in the form of conflict resolution).

I disagree that it would be appropriate to drop the conflict markers, though perhaps we can look at making it visually clearer that there's a conflict. (As I said, it *is* presented already, but the fact that you didn't notice that is some evidence that it might be worth improving that presentation.)