postgresql integration for heroku
fixed conflicts