fixed LOG_ERROR merge issue and alignment