Cleaning up conflicts