Hand-merge in the superclass_delegating_primary_key