Fix collapse CSS lost due to merge conflict errors
Merge branch 'master' of https://github.com/derekchen14/notableBeta