fix conflict
composer update to 2.2.2
update qrcode
up to 2.1.2
composer update kernal 2.1.1
up
Merge branch 'master' into release
name up