had to fix merge conflict in gem file think it still works
clearing migration file conflict and gemfile conflict
Merge branch 'master' of heroku.com:ratemylunch