delete demo
delete style demo, resolve merge conflict