cocoa_common: resolve conflicts