add hwe pvalues for case and ctrl
fix conflicts