simplify logging
merge