From c63031c1715040179f834540ead6a2ed57228c07 Mon Sep 17 00:00:00 2001
From: Omi <Omix1.ok@gmail.com>
Date: Thu, 4 Jan 2024 19:05:06 +0530
Subject: [PATCH] Created Conflict

---
 contributors/Normturtle/Conflict.md | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 contributors/Normturtle/Conflict.md

diff --git a/contributors/Normturtle/Conflict.md b/contributors/Normturtle/Conflict.md
new file mode 100644
index 0000000..1e2171d
--- /dev/null
+++ b/contributors/Normturtle/Conflict.md
@@ -0,0 +1,2 @@
+line changed by Thrid-branch
+line 2 for conflict