diff --git a/src/app/page.tsx b/src/app/page.tsx
index 64567a4..20fcbd6 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -1,8 +1,5 @@
 // ... existing imports ...
-<<<<<<< HEAD
 import Navbar from '@/components/layout/navbar';
-=======
->>>>>>> 489e65224a31d72e06ac62b08e200ebb42b171b3
 
 async function getData() {
   // Simulate a delay to show server-side data fetching