updated demo
fix merge conflicts