fixed merge conflict

spim_registration/timelapse/README.md

spim_registration/timelapse/Snakefile

spim_registration/timelapse/single_test.yaml

spim_registration/tools/#master_preprocessing#

spim_registration/tools/#rename-zeiss-files.sh#

spim_registration/tools/compress/create-compress-jobs.sh

spim_registration/tools/compress/for_czi.bsh

spim_registration/tools/compress/resubmit-failed-jobs.sh

spim_registration/tools/compress/submit-jobs

spim_registration/tools/czi_resave/#checkpoint.sh#

spim_registration/tools/czi_resave/checkpoint.sh

spim_registration/tools/czi_resave/create-resaving-jobs.sh

spim_registration/tools/czi_resave/resaving.bsh

spim_registration/tools/czi_resave/resubmit-failed-jobs.sh

spim_registration/tools/czi_resave/submit-jobs

spim_registration/tools/master_preprocessing.sh

spim_registration/tools/rename-zeiss-files.sh

spim_registration/tools/split_channels/create-split-jobs.sh

spim_registration/tools/split_channels/split.bsh

spim_registration/tools/split_channels/submit-jobs