fix other merge

examples/__pycache__/example_init.cpython-36.pyc

examples/__pycache__/example_init.cpython-37.pyc

examples/__pycache__/loading_HVI_code.cpython-36.pyc

examples/__pycache__/loading_HVI_code_fast.cpython-36.pyc

pulse_lib.egg-info/SOURCES.txt

pulse_lib/examples/IQ_testing.py

pulse_lib/examples/charge_stability_diagram.py

pulse_lib/examples/example_DC_pulses.py

pulse_lib/examples/example_init.py

pulse_lib/examples/loading_HVI_code.py

pulse_lib/examples/loading_HVI_code_fast.py

pulse_lib/examples/nagaoka_example.py

pulse_lib/examples/process_tomography_example.py

pulse_lib/examples/psb_example.py

pulse_lib/keysight/uploader.py

pulse_lib/keysight/uploader_core/mem_ctrl.cpp

pulse_lib/keysight/uploader_core/uploader.cp36-win_amd64.pyd

pulse_lib/keysight/uploader_core/uploader.cpp

pulse_lib/segments/data_classes/data_generic.py

pulse_lib/segments/data_classes/data_markers.py