Merge without losing entity type