style sheet edits
fix gemfile merge conlict