Index: source/ariba/overlay/modules/chord/Chord.cpp
===================================================================
--- source/ariba/overlay/modules/chord/Chord.cpp	(revision 5870)
+++ source/ariba/overlay/modules/chord/Chord.cpp	(revision 5871)
@@ -62,9 +62,5 @@
 
 	// create routing table
-<<<<<<< .working
-	this->table = new chord_routing_table(_nodeid, 2);
-=======
 	this->table = new chord_routing_table(_nodeid, 4);
->>>>>>> .merge-rechts.r5869
 	orphan_removal_counter = 0;
 	discovery_count = 0;
@@ -101,10 +97,6 @@
 
 	// establish link via base overlay
-<<<<<<< .working
-	return baseoverlay.establishLink(endp, node, OverlayInterface::OVERLAY_SERVICE_ID, remoteRelay );
-=======
 	return baseoverlay.establishLink( endpoint, remote,
 			OverlayInterface::OVERLAY_SERVICE_ID );
->>>>>>> .merge-rechts.r5869
 }
 
@@ -127,12 +119,6 @@
 	msg.encapsulate(&dmsg);
 
-<<<<<<< .working
-	// get next hop
-	const route_item* item = table->get_next_hop(destination);
-	if (item!=NULL && !item->info.isUnspecified()) send(&cmsg, item->info);
-=======
 	// send to node
 	baseoverlay.send_node( &msg, remote );
->>>>>>> .merge-rechts.r5869
 }
 
@@ -200,57 +186,14 @@
 const LinkID& Chord::getNextLinkId( const NodeID& id ) const {
 	// get next hop
-<<<<<<< .working
-	const route_item* item = table->get_next_hop(destnode);
-=======
 	const route_item* item = table->get_next_hop(id);
->>>>>>> .merge-rechts.r5869
-
-<<<<<<< .working
-	// message for this node? yes-> delegate to base overlay
-	if (item->id == nodeid || destnode == nodeid)
-		baseoverlay.incomingRouteMessage( msg, LinkID::UNSPECIFIED, nodeid );
-=======
+
 	// returns a unspecified id when this is itself
 	if (item == NULL || item->id == nodeid)
 		return LinkID::UNSPECIFIED;
->>>>>>> .merge-rechts.r5869
-
-<<<<<<< .working
-	else { // no-> send to next hop
-		ChordMessage cmsg(ChordMessage::route, nodeid, destnode);
-		cmsg.encapsulate(msg);
-		send(&cmsg, item->info);
-	}
-=======
+
 	/// return routing info
 	return item->info;
->>>>>>> .merge-rechts.r5869
-}
-
-<<<<<<< .working
-/// @see OverlayInterface.h
-void Chord::routeMessage(const NodeID& node, const LinkID& link, Message* msg) {
-	logging_debug("Redirect over Chord to node id=" << node.toString()
-			<< " link id=" << link.toString() );
-	ChordMessage cmsg(ChordMessage::route, nodeid, node);
-	cmsg.encapsulate(msg);
-	send(&cmsg, link);
-}
-
-/// @see OverlayInterface.h
-const LinkID& Chord::getNextLinkId( const NodeID& id ) const {
-	// get next hop
-	const route_item* item = table->get_next_hop(id);
-
-	// returns a unspecified id when this is itself
-	if (item == NULL || item->id == nodeid)
-		return LinkID::UNSPECIFIED;
-
-	/// return routing info
-	return item->info;
-}
-
-=======
->>>>>>> .merge-rechts.r5869
+}
+
 OverlayInterface::NodeList Chord::getKnownNodes(bool deep) const {
 	OverlayInterface::NodeList nodelist;
@@ -351,34 +294,6 @@
 	switch (m->getType()) {
 
-<<<<<<< .working
-	// invalid message
-	case M::invalid:
-		break;
-
-	// route message with payload
-	case M::route: {
-		// find next hop
-		const route_item* item = table->get_next_hop(m->getDestination());
-
-		// next hop == myself?
-		if (m->getDestination() == nodeid) { // yes-> route to base overlay
-			logging_debug("Send message to baseoverlay");
-			baseoverlay.incomingRouteMessage( m, item->info, remote );
-		}
-		// no-> route to next hop
-		else {
-			logging_debug("Route chord message to "
-				<< item->id.toString() << " (destination=" << m->getDestination() << ")");
-			send(m, item->info);
-		}
-		break;
-	}
-
-		// discovery request
-	case M::discovery: {
-=======
 	// discovery request
 	case typeDiscovery: {
->>>>>>> .merge-rechts.r5869
 		// decapsulate message
 		Discovery* dmsg = m->decapsulate<Discovery> ();
@@ -410,9 +325,5 @@
 					logging_debug("Discovery split: routing discovery message to successor "
 							<< succ_item->id.toString() );
-<<<<<<< .working
-					send(&cmsg_s, succ_item->info);
-=======
 					send(&omsg, succ_item->info);
->>>>>>> .merge-rechts.r5869
 				}
 
@@ -426,23 +337,10 @@
 					logging_debug("Discovery split: routing discovery message to predecessor "
 							<< pred_item->id.toString() );
-<<<<<<< .working
-					send(&cmsg_p, pred_item->info);
-=======
 					send( &omsg, pred_item->info);
->>>>>>> .merge-rechts.r5869
 				}
 			}
 			// no-> route message
 			else {
-<<<<<<< .working
-				// find next hop
-				const route_item* item = table->get_next_hop(m->getDestination());
-				if (item == NULL || item->id == nodeid) break;
-				logging_debug("routing discovery message to " <<
-						item->id.toString() );
-				send(m, item->info);
-=======
 				baseoverlay.send( m, m->getDestinationNode() );
->>>>>>> .merge-rechts.r5869
 			}
 			break;
@@ -526,9 +424,5 @@
 		// remove orphan links
 		orphan_removal_counter++;
-<<<<<<< .working
-		if (orphan_removal_counter <0 || orphan_removal_counter >= 4) {
-=======
 		if (orphan_removal_counter <0 || orphan_removal_counter >= 2) {
->>>>>>> .merge-rechts.r5869
 			logging_info("Running orphan removal");
 			orphan_removal_counter = 0;