Added images for merge conflicts

ASSIGNMENT-04-09-2025.md

@@ -52,6 +52,25 @@
 
 ![alt text](<fast-forward merge-2.png>) 
 
+## Merge Conflict 
+
+![alt text](<add number in main and training branch.png>)
+
+![alt text](<merge conflict.png>)
+
+![alt text](<merge conflict1.png>)
+
+## Did Git perform a fast-forward merge or a 3-way merge?
+
+Perform fast-forward merge and merge conflict
+
 ## What does git log --graph --oneline --all show after the merge?
 
 ![alt text](<git log--graph--oneline--all.png>)
+
+## git log --graph --oneline --all after Merge conflict
+
+![alt text](<git log graph oneline after merge conflict.png>)
+
+
+