fix merge

examples/__pycache__/example_init.cpython-36.pyc

examples/__pycache__/loading_HVI_code.cpython-36.pyc

examples/__pycache__/loading_HVI_code_fast.cpython-36.pyc

examples/example_init.py

examples/loading_HVI_code.py

examples/loading_HVI_code_fast.py

examples/nagaoka_example.py

examples/psb_example.py

pulse_lib/base_pulse.py

pulse_lib/keysight/uploader.py

...uploader_core/keysight_awg_post_processing_and_upload.cpp

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/keysight/uploader_core/uploader.pyx

pulse_lib/keysight_minimal_upload_script.py

pulse_lib/segments/data_classes/data_markers.py

pulse_lib/segments/segment_container.py

pulse_lib/segments/segment_markers.py

pulse_lib/segments/segment_pulse.py