finished expand/collapse blocks
merged