manage conflicts