fixed merge errors
xxx(msg, args) changed to xxxFormat(msg, args)