diff --git a/src/ziggurat/messaging/producer.clj b/src/ziggurat/messaging/producer.clj
index fda943c4..61679521 100644
--- a/src/ziggurat/messaging/producer.clj
+++ b/src/ziggurat/messaging/producer.clj
@@ -97,10 +97,6 @@
       (metrics/increment-count ["rabbitmq" "publish"] "exception" {:topic-entity (name (:topic-entity message-payload))
                                                                    :retry-counter retry-counter})
       :retry-with-counter)))
-<<<<<<< HEAD
-
-=======
->>>>>>> 6a8eb91... Add retry states for publish
 
 (defn- publish-retry-config []
   (-> (ziggurat-config) :rabbit-mq-connection :publish-retry))
@@ -108,7 +104,6 @@
 (defn- non-recoverable-exception-config []
   (:non-recoverable-exception (publish-retry-config)))
 
-
 (defn publish
   "This is meant for publishing to rabbitmq.
   * Checks if the pool is alive - We do this so that publish does not happen after the channel pool state is stopped.
@@ -125,9 +120,8 @@
    (when (is-pool-alive? cpool/channel-pool)
      (let [result (publish-internal exchange message-payload expiration retry-counter)]
        (when (pos? retry-counter)
-         (do
-           (log/info "Retrying publishing the message to " exchange)
-           (log/info "Retry attempt " retry-counter)))
+         (log/info "Retrying publishing the message to " exchange)
+         (log/info "Retry attempt " retry-counter))
        (log/info "Publish result " result)
        (cond
          (= result :success) nil