fix the 3.8
fix the merge
test