git merge defaultToUpstream
psql rc file