It looks like the merge is pulling in foreign keys that are no longer valid. (e.g. content_view_definition* no longer exists)