fixing bugs in conflict analysis