rolled back DB and edited Gemfile for duplications
merged files
Pulled from develop for gemfile update and scrape job