fix(ci): avoid merge conflicts on postgres branch update

fix(ci): avoid merge conflicts on postgres branch update #214