cleaning up conflicts