resolve forgotten conflict in cocoa code