fixed collapsible content border
merged
merged