add logging
manual merge