add bootstrap fixes
merge conflict resolve delete music