attempted fix of conflict