update demo
fixed merge