include postgres gem
host name provided
conflict resolved