added block entities
merged