Fix new entity identity conflicts