fixing up conflicts