diff --git a/__test__/components/EventErrorHandling.test.tsx b/__test__/components/EventErrorHandling.test.tsx
index f08e8d1..098e881 100644
--- a/__test__/components/EventErrorHandling.test.tsx
+++ b/__test__/components/EventErrorHandling.test.tsx
@@ -69,10 +69,13 @@ describe("Event Error Handling", () => {
       renderWithProviders(<CalendarLayout />, erroredState)
     );
 
-    await waitFor(() => {
-      expect(screen.getByText("Test Event"));
-      expect(screen.getByRole("alert")).toBeInTheDocument();
-    });
+    await waitFor(
+      () => {
+        expect(screen.getByText("Test Event"));
+        expect(screen.getByRole("alert")).toBeInTheDocument();
+      },
+      { timeout: 10000 }
+    );
     const closeButton = screen.queryByRole("button", { name: "common.ok" });
 
     if (closeButton) {
@@ -82,9 +85,12 @@ describe("Event Error Handling", () => {
         fireEvent.click(closeButton);
       });
 
-      await waitFor(() => {
-        expect(screen.queryByRole("alert")).not.toBeInTheDocument();
-      });
+      await waitFor(
+        () => {
+          expect(screen.queryByRole("alert")).not.toBeInTheDocument();
+        },
+        { timeout: 5000 }
+      );
 
       const afterCloseWarnCount = consoleWarnSpy.mock.calls.length;
 
diff --git a/src/features/Events/EventDisplayPreview.tsx b/src/features/Events/EventDisplayPreview.tsx
index d6dede6..ed3e70e 100644
--- a/src/features/Events/EventDisplayPreview.tsx
+++ b/src/features/Events/EventDisplayPreview.tsx
@@ -381,7 +381,6 @@ export default function EventPreviewModal({
                     onOpenDuplicate={() => {
                       setToggleActionMenu(null);
                       setHidePreview(true);
-<<<<<<< HEAD
                       setOpenDuplicateModal(true);
                     }}
                   />
@@ -626,7 +625,6 @@ export default function EventPreviewModal({
                 }
                 text={t("eventPreview.alarmText", {
                   trigger: t(`event.form.notifications.${event.alarm.trigger}`),
-<<<<<<< HEAD
                   action: (() => {
                     if (!event.alarm.action) return "";
                     const translationKey = `event.form.notifications.${event.alarm.action}`;
@@ -636,9 +634,6 @@ export default function EventPreviewModal({
                       ? event.alarm.action
                       : translated;
                   })(),
-=======
-                  action: event.alarm.action || "",
->>>>>>> 4ddc44d (chore: update twake-mui dependency and use radius.lg for create event button)
                 })}
                 style={{
                   fontSize: "16px",
diff --git a/src/locales/en.json b/src/locales/en.json
index 3a51110..5643d43 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -152,7 +152,9 @@
         "-PT1D": "1 day before",
         "-PT2D": "2 days before",
         "-PT1W": "1 week before",
-        "EMAIL": "email"
+        "EMAIL": "email",
+        "DISPLAY": "display",
+        "AUDIO": "audio"
       },
       "showMeAs": "Show me as",
       "free": "Free",
diff --git a/src/locales/fr.json b/src/locales/fr.json
index 860042e..deda948 100644
--- a/src/locales/fr.json
+++ b/src/locales/fr.json
@@ -154,7 +154,9 @@
         "-PT1D": "1 jour avant",
         "-PT2D": "2 jours avant",
         "-PT1W": "1 semaine avant",
-        "EMAIL": "e-mail"
+        "EMAIL": "e-mail",
+        "DISPLAY": "affichage",
+        "AUDIO": "audio"
       },
       "showMeAs": "M'afficher comme",
       "free": "Libre",
diff --git a/src/locales/ru.json b/src/locales/ru.json
index c0351b8..04c2141 100644
--- a/src/locales/ru.json
+++ b/src/locales/ru.json
@@ -154,7 +154,9 @@
         "-PT1D": "За 1 день",
         "-PT2D": "За 2 дня",
         "-PT1W": "За 1 неделю",
-        "EMAIL": "Email"
+        "EMAIL": "Email",
+        "DISPLAY": "Отображение",
+        "AUDIO": "Звук"
       },
       "showMeAs": "Показать как",
       "free": "Свободен",
diff --git a/src/locales/vi.json b/src/locales/vi.json
index b9e5e4e..2e33a4f 100644
--- a/src/locales/vi.json
+++ b/src/locales/vi.json
@@ -152,7 +152,9 @@
         "-PT1D": "1 ngày trước",
         "-PT2D": "2 ngày trước",
         "-PT1W": "1 tuần trước",
-        "EMAIL": "email"
+        "EMAIL": "email",
+        "DISPLAY": "hiển thị",
+        "AUDIO": "âm thanh"
       },
       "showMeAs": "Hiển thị tôi là",
       "free": "Rảnh",