Moved Bootstrap css to scss.
Added bootstrap SASS.
fixed merge conflicts