update log
merge