use log_dir
merge conflict