changed to qbytearray
resolved merge conflicts