diff --git a/src/lib/helpers.ts b/src/lib/helpers.ts
index 556bdfe..17975f0 100644
--- a/src/lib/helpers.ts
+++ b/src/lib/helpers.ts
@@ -59,7 +59,3 @@ export function uniqueID(): string {
 
 const baseUrl = import.meta.env?.VITE_BASE_URL || '/';
 export const TEMPLATE_CSV_URL = `${baseUrl}template_notification.csv`;
-<<<<<<< HEAD
-=======
-
->>>>>>> 10532a7cb1d720488c181b1fcac3b8046c888e77