You still need a resolution, though. (1) conflict (2) either conflict is solved or it is definitely unsolved.