update font for headings in bootstrap
fixed merge conflicts