updates to some conflicts