merge logger.cpp