Removed DB Migrations
Attempt to fix for Heroku deployment
Fixed Merge Conflicts
Fixed Merge Conflicts