Necessary upgrade for libStatGen update
fix merging conflicts