From 36c0cf20080daaad549cbbfc6b6207276f92c418 Mon Sep 17 00:00:00 2001
From: Rawan Abdellatif <rawan.k.abdellatif@gmail.com>
Date: Mon, 25 Nov 2024 21:28:16 -0700
Subject: [PATCH] Resolve merge conflicts for src/pages/team.js

---
 src/pages/team.js | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/pages/team.js b/src/pages/team.js
index 51df6c1b..0ee987bf 100644
--- a/src/pages/team.js
+++ b/src/pages/team.js
@@ -258,19 +258,14 @@ const TeamMemberList = [
       {
         name: "Khaled Badran",
         degree:", MSc",
-<<<<<<< HEAD
         place:"Alraqamia",
         position:"Currently Lead AI Engineer",
         // link:"https://sycodal.ca/fr/",
         // place:"Alraqmyia"
-=======
-        place:"Alraqmyia"
-        position:"Lead AI Engineer"
->>>>>>> 7fce4c1c9f90c8296f8aeea7a9c885a74757d4af
         twitter: "khaled_badran9",
         linkedin: "khaled-badran-6b0908174",
         //affilitaion: "Concordia"
-      },
+      }, 
       {
         name: "Rached Bouchoucha",
         degree:", MSc",