fix small merge mistake
fix small type mismatch