From 5cb594ee16aa3a1d152b6d1339f505f571447e7d Mon Sep 17 00:00:00 2001
From: jstchw <bobr703@gmail.com>
Date: Mon, 16 Mar 2026 17:46:18 +0700
Subject: [PATCH] rebase practice on main 1

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

diff --git a/README.md b/README.md
index cbf3218..cd4ae14 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,5 @@
 This will be a GIT local training repo.
 
-Good checkpoint
\ No newline at end of file
+Good checkpoint
+
+Conflicting line main specific
\ No newline at end of file