trying to get postgres to work
fixing merge conflicts?