add log
merge