gem pg
added pg to heroku
remove conflits