fixed pg gem issue
fixed merge conflict