add test nolock
fix conflict