fixed merge problem, pg adjustments, pg schema