few changes to gemfile
Conflic resolution
Added Gemfile lines for Mac