Manage conflicts