fixed bug in conflict management