better logging
merge