adding postgres db to production
merge conflicts removed