fix merge issues
Merge pull request #75 from unidal/abtest

fix merge issues