new collapsible
Merge branch 'diff-collapse'