improve doc
fix conflict
Merge remote-tracking branch 'origin/master'
Add snippet