fix demo
merge