update log.log
merge dev