Change db user and db name so we can connect to postgres
Fix merge issue