add pg to gemfile
fix gemfile merge conflict