From 0eef4cac56c20ded6d3e49dce73086cfff171277 Mon Sep 17 00:00:00 2001
From: Sirin Puenggun <sirin_29@hotmail.co.th>
Date: Tue, 15 Aug 2023 15:47:57 +0700
Subject: [PATCH] Update conflict on README.md

---
 README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 08e9507..63fd76e 100644
--- a/README.md
+++ b/README.md
@@ -5,4 +5,6 @@ by Sirin Puenggun
 * [Introduction to Concurrency and Parallelism](introduction.md)
   * [Asynchronous Programming with asyncio](asynchronous.md)
   * [Parallelism with multiprocessing](multiprocessing.md)
-  * [Combining Concurrency and Parallelism](combining.md)
\ No newline at end of file
+  * [Combining Concurrency and Parallelism](combin <- Conflict Here too!
+
+This is conflict!