changes for heroku cedar stack
Resolved Merge conflict
Updated Gemfile
fix Gemfile.lock