resolve conflice

.gitignore

.../keysight_videomaps/data_getter/scan_generator_Virtual.py

core_tools/GUI/param_viewer/param_viewer_GUI_main.py

core_tools/GUI/virt_gate_matrix/virt_gate_matrix_main.py

core_tools/job_mgnt/calibrations/calib_examples/SD_cal.py

...ols/job_mgnt/calibrations/calib_examples/fit_functions.py

...tools/job_mgnt/calibrations/calib_examples/run_example.py

...mgnt/calibrations/calib_examples/transition_line_detct.py

...s/job_mgnt/calibrations/calib_examples/virtual_station.py

core_tools/job_mgnt/calibrations/calibration_data.py

core_tools/job_mgnt/calibrations/calibration_single.py

core_tools/job_mgnt/calibrations/data/__init__.py

core_tools/job_mgnt/calibrations/data/calibration_data.py

...tools/job_mgnt/calibrations/data/calibration_parameter.py

core_tools/job_mgnt/calibrations/data/calibration_querier.py

core_tools/job_mgnt/calibrations/data/my_test_db.sqlite

core_tools/job_mgnt/calibrations/utility.py

core_tools/sweeps/sweeps.py

sample_specific/station/load_station.py