fixed Gemfile
more gemfile tweaks / conflict resolution