more logging
merge