fixed merge conflicts

binarycpython/tests/main.py

binarycpython/tests/main_with_notebooks.py

binarycpython/tests/test_c_bindings.py

binarycpython/tests/test_custom_logging.py

binarycpython/tests/test_distributions.py

binarycpython/tests/test_functions.py

binarycpython/tests/test_grid.py

binarycpython/tests/test_grid_options_defaults.py

binarycpython/tests/test_notebooks.py

binarycpython/tests/test_plot_functions.py

binarycpython/tests/test_spacing_functions.py

binarycpython/utils/custom_logging_functions.py

binarycpython/utils/dicts.py

binarycpython/utils/distribution_functions.py

binarycpython/utils/ensemble.py

binarycpython/utils/functions.py

binarycpython/utils/grid.py

binarycpython/utils/grid_options_defaults.py

binarycpython/utils/plot_functions.py

binarycpython/utils/run_system_wrapper.py