clean up conflicts