Add pg gems
Merge gem conflicts