switch to pg
Merge branch 'master' of github.com:clarat-org/clarat
fix merge
Fix merge conflicts