diff --git a/src/containers/AddAnnouncementForm.jsx b/src/containers/AddAnnouncementForm.jsx
index 1ab6f56c3d31c7ef9ba89516a6d059eb9606dd5e..9febd43c003ee16fbef231e60126daf5b6e89a40 100644
--- a/src/containers/AddAnnouncementForm.jsx
+++ b/src/containers/AddAnnouncementForm.jsx
@@ -13,10 +13,7 @@ const AddAnnouncementForm = ({ className }) => {
   const onAdd = (evt) => {
     if (!!text) {
       addAnnouncement.run({ content: text });
-<<<<<<< HEAD
       setText("");
-=======
->>>>>>> 553808a17622e42407bd4764fc036b589518a072
     }
   };