add flowDemo
resolute conflict