dealing with some conflicts