change qr_scan
merge branch