fix the correctness problem
just commit
fix conflict