diff --git a/src/components/common/SendEmailDialog.vue b/src/components/common/SendEmailDialog.vue
index 921bbf907..254eb9cf9 100644
--- a/src/components/common/SendEmailDialog.vue
+++ b/src/components/common/SendEmailDialog.vue
@@ -60,11 +60,7 @@ async function confirm() {
                     v-model="address"
                     is-outlined
                     autofocus
-<<<<<<< HEAD
-                    data-cy="sendEmailDialog_address"
-=======
                     data-cy="SendEmailNotifiactionDialogInput"
->>>>>>> a0e79104a8b3a1cb1be132b13f30759a4ea2e007
                 />
             </QCardSection>
             <QCardActions align="right">