- put non-failing conflicts