diff --git a/app/javascript/flavours/glitch/components/status_action_bar.jsx b/app/javascript/flavours/glitch/components/status_action_bar.jsx
index 51a03084ae..f90e364627 100644
--- a/app/javascript/flavours/glitch/components/status_action_bar.jsx
+++ b/app/javascript/flavours/glitch/components/status_action_bar.jsx
@@ -339,16 +339,12 @@ class StatusActionBar extends ImmutablePureComponent {
/>
-// <<<<<<< HEAD
-//
-// =======
{
permissions
?
: reactButton
}
-// >>>>>>> emoji-reactions
{filterButton}