cleaned up some conflicts