diff --git a/daprdocs/content/en/developing-applications/building-blocks/pubsub/howto-publish-subscribe.md b/daprdocs/content/en/developing-applications/building-blocks/pubsub/howto-publish-subscribe.md
index 7c7947238..e51215351 100644
--- a/daprdocs/content/en/developing-applications/building-blocks/pubsub/howto-publish-subscribe.md
+++ b/daprdocs/content/en/developing-applications/building-blocks/pubsub/howto-publish-subscribe.md
@@ -559,6 +559,7 @@ The `/checkout` endpoint matches the `route` defined in the subscriptions and th
 
 ## Step 3: Publish a topic
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
 =======
@@ -567,6 +568,8 @@ The `/checkout` endpoint matches the `route` defined in the subscriptions and th
 To publish a topic you need to run an instance of a Dapr sidecar to use RabbitMQ component. You can use the default Redis component installed into your local environment.
 
 >>>>>>> e67fd5fd (Modified based on the review comments - 1)
+=======
+>>>>>>> 1e8d79ce (Removed a line)
 Start an instance of Dapr with an app-id called `orderprocessing`:
 
 ```bash