add psql init file
resolve merge conflicts