merge
merge2
change log directory