merge 2 linux
Merge remote-tracking branch 'demo/master'

To learn
conflict resolve