added migrations and pushed to heroku
adding pg database
fix conflics