clean up merge conflict foo.
subprocessing keyboard interupt and logging work
dman those .DS_Store files