updated scrapers.rb
fixed merge conflict
movies api
resolving merge conflicts