unfinished conflict resolution