# Conflicts:
#	.gitignore
#	src/helpers.py
#	src/model_modules/model_class.py
#	src/plotting/postprocessing_plotting.py
#	src/run_modules/experiment_setup.py
#	src/run_modules/model_setup.py
#	test/test_helpers.py
#	test/test_model_modules/test_model_class.py