fixed up conflicts