init demo
alter on dev commit on master
alter & add on dev commit on master
alter add commit on dev
confilt test
Merge branch 'master' of https://github.com/suweya/Demo