add bootstrap sass to Gemfile
resolve merge conflicts