Fixed an ugly merge

AppKit/CPTabView.j

@@ -390,7 +390,7 @@ var CPTabViewDidSelectTabViewItemSelector           = 1 << 1,
 
         [_box setFrame:CGRectMake(0, origin, CGRectGetWidth(aFrame),
                                    CGRectGetHeight(aFrame) - segmentedHeight / 2)];
-
+        [self _updateItems];
         [self _repositionTabs];
     }
 }

AppKit/CPTabViewItem.j

@@ -90,6 +90,7 @@ CPPressedTab    = 2;
 - (void)setLabel:(CPString)aLabel
 {
     _label = aLabel;
+    [_tabView setNeedsLayout];
 }
 
 /*!