mean shift to zero
fix
merge