working on postgres
conclude merge