add logger
merge