added demo line -git bash
resolved merge conflict