fix log
merge