add demo files
fix merge conflict