Correcting Catalog Conflicts