Add Objective-C/Extensions: BlocksKit
Resolve conflict