add git-demo-conflict