Fixing up some conflicts