Got rid of merge conflicts
Heroku giving 404 so I changed a line in confiv/environments/production.rb as per stack overflow's advice.