Rework Conflicts/Depends.