From fc46793acc7c9137d2faac7cb7e4e92479879812 Mon Sep 17 00:00:00 2001 From: Elton Chang Date: Fri, 30 Jan 2026 14:17:02 -0500 Subject: [PATCH 1/3] Conflict change in readme --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 9debd17..31e739c 100644 --- a/README.md +++ b/README.md @@ -145,3 +145,7 @@ Papers + some implementation notes: ### License MIT + +### Merge conflict change + +I love github \ No newline at end of file From e70229c28ecad8634634f3aa279b89e1dd19b12f Mon Sep 17 00:00:00 2001 From: Elton Chang Date: Fri, 30 Jan 2026 14:19:12 -0500 Subject: [PATCH 2/3] conflict change in main --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index 9debd17..9aaf765 100644 --- a/README.md +++ b/README.md @@ -145,3 +145,8 @@ Papers + some implementation notes: ### License MIT + + +## My change in main + +I do not like github \ No newline at end of file From ecacc555038bbeebc945a1c41926a29c3708f18b Mon Sep 17 00:00:00 2001 From: Elton Chang Date: Fri, 30 Jan 2026 14:30:13 -0500 Subject: [PATCH 3/3] Readme saying i love pr --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index dc8e8a7..97ef150 100644 --- a/README.md +++ b/README.md @@ -150,3 +150,5 @@ MIT I love github +### Pull Request Part +I love pull request \ No newline at end of file