message log fix
merge