merge has_entities_in change