fix merge errors (merge from single part pg version)