sm doc fix
fix conflict