diff --git a/Source/NSTreeController.m b/Source/NSTreeController.m
index 8eb769b5c..6e030edb1 100644
--- a/Source/NSTreeController.m
+++ b/Source/NSTreeController.m
@@ -241,13 +241,8 @@
   GSKeyValueBinding *theBinding;
 
   [self setContent: obj];
-<<<<<<< HEAD
   theBinding = [GSKeyValueBinding getBinding: NSContentObjectBinding
 				   forObject: self];
-=======
-  theBinding = [GSKeyValueBinding getBinding: NSContentObjectBinding 
-                                   forObject: self];
->>>>>>> e8ed44e86 (Update bindings)
   if (theBinding != nil)
     [theBinding reverseSetValueFor: @"content"];
 }
@@ -432,7 +427,11 @@
 	      [self setChildrenKeyPath:
 		      [coder decodeObjectForKey: @"NSTreeContentLeafKey"]];
 	    }
+<<<<<<< HEAD
 
+=======
+	  
+>>>>>>> 476bad540 (Add proper encoding decoding for keyed objects)
 	  // Since we don't inherit from NSArrayController these are decoded here
 	  // as well.
 	  if ([coder containsValueForKey: @"NSAvoidsEmptySelection"])
@@ -454,6 +453,7 @@
     }
   else
     {
+<<<<<<< HEAD
       id obj = nil;
       BOOL f = NO;
 
@@ -473,6 +473,8 @@
       [coder decodeValueOfObjCType: @encode(BOOL)
 				at: &f];
       [self setSelectsInsertedObjects: f];
+=======
+>>>>>>> 476bad540 (Add proper encoding decoding for keyed objects)
     }
 
   return self;
@@ -481,6 +483,10 @@
 - (void) encodeWithCoder: (NSCoder*)coder
 {
   [super encodeWithCoder: coder];
+<<<<<<< HEAD
+=======
+  
+>>>>>>> 476bad540 (Add proper encoding decoding for keyed objects)
   if ([coder allowsKeyedCoding])
     {
       [coder encodeObject: _childrenKeyPath
@@ -500,6 +506,7 @@
     }
   else
     {
+<<<<<<< HEAD
       id obj = nil;
       BOOL f = NO;
 
@@ -519,6 +526,8 @@
       f = [self selectsInsertedObjects];
       [coder encodeValueOfObjCType: @encode(BOOL)
 				at: &f];
+=======
+>>>>>>> 476bad540 (Add proper encoding decoding for keyed objects)
     }
 }