From dfa46d6f3a575b82a2e07ff9d65bdda840e60b26 Mon Sep 17 00:00:00 2001
From: kkomeng <79188549+kkomeng@users.noreply.github.com>
Date: Thu, 21 Sep 2023 21:08:33 +0900
Subject: [PATCH 1/5] A new file added.

---
 my-file.md | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 my-file.md

diff --git a/my-file.md b/my-file.md
new file mode 100644
index 0000000..6a7a084
--- /dev/null
+++ b/my-file.md
@@ -0,0 +1,2 @@
+# my-file
+This is my file that I've added.
\ No newline at end of file

From 92eacbf49fd27bc262252212cbbaed2ff5dca5b1 Mon Sep 17 00:00:00 2001
From: kkomeng <79188549+kkomeng@users.noreply.github.com>
Date: Thu, 21 Sep 2023 21:10:30 +0900
Subject: [PATCH 2/5] A new line was added in line 6.

---
 README.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/README.md b/README.md
index b4e4852..a99abbb 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,6 @@
 # A scratch repo on GitHub.com
+
+
+
+
+my caption
\ No newline at end of file

From 8908058559a61a2f886e3c9ef2263ccb96884f36 Mon Sep 17 00:00:00 2001
From: kkomeng <79188549+kkomeng@users.noreply.github.com>
Date: Thu, 21 Sep 2023 21:35:46 +0900
Subject: [PATCH 3/5] Update README.md

A new heading was added on line 4. Please review if it is apropriate.
---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index a99abbb..8067ab8 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # A scratch repo on GitHub.com
 
 
+## Mojo
 
-
-my caption
\ No newline at end of file
+my caption

From 1d8324867a932dcd458d1c585f5c2ee932d5227f Mon Sep 17 00:00:00 2001
From: kkomeng <79188549+kkomeng@users.noreply.github.com>
Date: Fri, 22 Sep 2023 00:21:23 +0900
Subject: [PATCH 4/5] added a single line

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

diff --git a/my-file.md b/my-file.md
index 6a7a084..1664817 100644
--- a/my-file.md
+++ b/my-file.md
@@ -1,2 +1,4 @@
 # my-file
-This is my file that I've added.
\ No newline at end of file
+This is my file that I've added.
+
+a line is added to test a merge conflict.
\ No newline at end of file

From 31c1ca55bc02daf5719deb12c1f191d92765dc3e Mon Sep 17 00:00:00 2001
From: kkomeng <79188549+kkomeng@users.noreply.github.com>
Date: Fri, 22 Sep 2023 00:28:50 +0900
Subject: [PATCH 5/5] first mod to test merge conflict.

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 8067ab8..326f42d 100644
--- a/README.md
+++ b/README.md
@@ -4,3 +4,4 @@
 ## Mojo
 
 my caption
+change made here to test merge conflict.