fix create postgres user
removed temp files
merge failed, trying again