Remove internal links to old resolve-conflict