resolve the conflict after merging the master branch.
resolve the conflict after merging the master branch.

DiCarloLab-Delft/PycQED_py3,DiCarloLab-Delft/PycQED_py3,QudevETH/PycQED_py3,DiCarloLab-Delft/PycQED_py3