fix: remove remaining conflict
Update prov store links