From 4621d8e1cc169d08629e10f442efda8e7aaebf61 Mon Sep 17 00:00:00 2001
From: unknown <essmat884@gmail.com>
Date: Sat, 10 Dec 2022 14:21:12 +0200
Subject: [PATCH] second trial to get a merge conflict!

---
 members.json | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/members.json b/members.json
index 9001940..2602cfd 100644
--- a/members.json
+++ b/members.json
@@ -1,9 +1,14 @@
 {
-    "members" : [
-        {
-            "name" : "Omar Elshopky",
-            "role" : "Founder / Projects Director",
-            "avatar" : "batman"
-        }
-    ]
-}
\ No newline at end of file
+  "members": [
+    {
+      "name": "Omar Elshopky",
+      "role": "Founder / Projects Director",
+      "avatar": "batman"
+    },
+    {
+      "name": "AAA Second Trial",
+      "role": "Dev",
+      "avatar": "male-1"
+    }
+  ]
+}