Added pgen_probability legacy user
new refsys
conflict resolution