Add Entities
fix children disappear
fix merge