diff --git a/src/status_im2/contexts/chat/messages/drawers/view.cljs b/src/status_im2/contexts/chat/messages/drawers/view.cljs
index f1c7f41169..733defaef4 100644
--- a/src/status_im2/contexts/chat/messages/drawers/view.cljs
+++ b/src/status_im2/contexts/chat/messages/drawers/view.cljs
@@ -55,11 +55,7 @@
        :on-press #(do
                     (close-bottom-sheet-fn nil)
                     (rf/dispatch [:chat.ui/delete-message-for-me message-data
-<<<<<<< HEAD
                                   constants/delete-message-for-me-undo-time-limit-ms]))
-=======
-                                 constants/delete-message-for-me-undo-time-limit-ms]))
->>>>>>> 559fd9bc7 (Handle reaction drawer height)
        :label    (i18n/label :t/delete-for-me)
        :icon     :i/delete
        :id       :delete-for-me}])