fix merge conflict

libp2p/Host.h

@@ -125,6 +125,7 @@ class HostNodeTableHandler: public NodeTableEventHandler
  * @todo gracefully disconnect peer if peer already connected
  * @todo determinePublic: ipv6, udp
  * @todo handle conflict if addNode/requireNode called and Node already exists w/conflicting tcp or udp port
+ * @todo writing host identifier
  */
 class Host: public Worker
 {

libwebthree/WebThree.h

@@ -54,7 +54,7 @@ class WebThreeNetworkFace
 {
 public:
 	/// Get information on the current peer set.
-	virtual std::vector<p2p::PeerInfo> peers() = 0;
+	virtual std::vector<p2p::PeerSessionInfo> peers() = 0;
 
 	/// Same as peers().size(), but more efficient.
 	virtual size_t peerCount() const = 0;