Fix conflict
Fix Gemfile.lock conflict
add pg gem
remove the text unneed
minor change
Updated