modified pg settings
fix merge conflict in db.yml