diff --git a/ASSIGNMENT-04-09-2025.md b/ASSIGNMENT-04-09-2025.md
index 2daeba1..c3d434e 100644
--- a/ASSIGNMENT-04-09-2025.md
+++ b/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>)
+
+
+
diff --git a/add number in main and training branch.png b/add number in main and training branch.png
new file mode 100644
index 0000000..0698631
Binary files /dev/null and b/add number in main and training branch.png differ
diff --git a/git log graph oneline after merge conflict.png b/git log graph oneline after merge conflict.png
new file mode 100644
index 0000000..1605ec3
Binary files /dev/null and b/git log graph oneline after merge conflict.png differ
diff --git a/merge conflict.png b/merge conflict.png
new file mode 100644
index 0000000..702a608
Binary files /dev/null and b/merge conflict.png differ
diff --git a/merge conflict1.png b/merge conflict1.png
new file mode 100644
index 0000000..a369a09
Binary files /dev/null and b/merge conflict1.png differ