Adding QR code and logo customization
Resolving conflict