updated qrcode + index to create qrcode
fixed merge conflicts