clean up conflicts history