From 365b437dab9488bcbe3864009779c3d915ee5df8 Mon Sep 17 00:00:00 2001
From: BenOkojie <83321573+BenOkojie@users.noreply.github.com>
Date: Mon, 29 Sep 2025 00:28:07 -0400
Subject: [PATCH] resolve merge conflict

---
 src/team/benjamin.ts | 14 ++++++++++++++
 src/team/index.ts    |  3 ++-
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 src/team/benjamin.ts

diff --git a/src/team/benjamin.ts b/src/team/benjamin.ts
new file mode 100644
index 0000000..5c1a02e
--- /dev/null
+++ b/src/team/benjamin.ts
@@ -0,0 +1,14 @@
+import { TeamMember } from "../types/TeamMember";
+
+export const benjamin: TeamMember = {
+  name: "Benjamin Okojie",
+  role: "Software Engineer",
+  funFact: "I'm a crock pot connoisseur!",
+  githubUsername: "benokojie",
+  // Feel free to customize your card's styles!
+  cardStyle: {
+    background: "bg-green-000",
+    border: "border border-slate-300",
+    text: "text-slate-300",
+  },
+};
\ No newline at end of file
diff --git a/src/team/index.ts b/src/team/index.ts
index bef4178..bb39c5e 100644
--- a/src/team/index.ts
+++ b/src/team/index.ts
@@ -5,5 +5,6 @@ import { hunter } from "./hunter";
 import { chris } from "./chris";
 import { spencer } from "./spencer";
 import { raafay } from "./raafay";
+import { benjamin } from "./benjamin";
 
-export const teamMembers: TeamMember[] = [sharib, ahmad, hunter, chris, spencer, raafay];
+export const teamMembers: TeamMember[] = [sharib, ahmad, hunter, chris, spencer, raafay, benjamin];
\ No newline at end of file