managing some conflicts