change gemfile for heroku
fix merge issues