logfoodview update
merge error fix
merge fix