pushed demo
fixed merge