Constraints Conflicts resolved