Resolve conflict(pick up `fa43165adf3814f6dd804b9cc6d8c75680fd08e8`)
Resolve conflict(pick up `fa43165adf3814f6dd804b9cc6d8c75680fd08e8`)

CocoaLumberjack/CocoaLumberjack,sushichop/CocoaLumberjack,sushichop/CocoaLumberjack,CocoaLumberjack/CocoaLumberjack,sushichop/CocoaLumberjack,CocoaLumberjack/CocoaLumberjack,sushichop/CocoaLumberjack,CocoaLumberjack/CocoaLumberjack