diff --git a/libp2p/pubsub/pubsub.py b/libp2p/pubsub/pubsub.py
index cd2345f..af37ee0 100644
--- a/libp2p/pubsub/pubsub.py
+++ b/libp2p/pubsub/pubsub.py
@@ -1,17 +1,6 @@
 # pylint: disable=no-name-in-module
 import asyncio
 import time
-<<<<<<< HEAD
-from typing import (
-    Any,
-    Dict,
-    List,
-    Sequence,
-    Tuple,
-)
-
-=======
->>>>>>> Add basic functionalities of `publish`
 from typing import (
     Any,
     Dict,