fixed broken merge logic in entity class generator