fixed 'conflicts' constrains