add functions crypto qr
 solved conflict