resolved the merge conflicts in test_risch