Fixing merge conflict
When in doubt, use brute JS^H^Hforce to add warnings
merge bootstrap/sparkline changes