cleared up conflicts