update lib for debug
resolve conflict