add demo
conflict
check
confict fixed