chore: updating files for heroku deployment
chore: fix merge conflicts in Gemfile