add pg
resolve merge conflict