fixed more merge errors and added DISPATCH_ONCE for default formatters in place of checking for null