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"