From 403f8c276602c7ac73a438f4771ac5ec102cd035 Mon Sep 17 00:00:00 2001
From: Young Minds <109673364+ygminds73@users.noreply.github.com>
Date: Fri, 7 Nov 2025 08:07:31 +0530
Subject: [PATCH] Update Script1.sh

---
 Script1.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Script1.sh b/Script1.sh
index 84f56d3..a0421ff 100644
--- a/Script1.sh
+++ b/Script1.sh
@@ -3,3 +3,4 @@ echo "We are from batch-25 and learning git/gihub"
 echo "We are learning Branching"
 echo "I am learning Devops"
 echo "Adding new line"
+echo "this is example of merge conflict"