clean up some conflicts