added demo
resolved conflict demo2