3 ms·(1) stuff happensby hexane360 8y ago(1) stuff happenssacado2 8y agoYou still need a resolution, though. (1) conflict (2) either conflict is solved or it is definitely unsolved.