merged 30