added pg db
fixed merge