clear master branch
merge demo
Merge branch 'master' into demo