diff --git a/ISEN/Cloud Computing/CIPA4/Cloud Computing Cours 3.md b/ISEN/Cloud Computing/CIPA4/Cloud Computing Cours 3.md
index c88a050..952acb0 100644
--- a/ISEN/Cloud Computing/CIPA4/Cloud Computing Cours 3.md	
+++ b/ISEN/Cloud Computing/CIPA4/Cloud Computing Cours 3.md	
@@ -14,3 +14,9 @@
 ## ff-merge
 ![](https://cdn.breizhhardware.fr/FAKA3/fOwOhUJo22.png/raw)
 
+## 3-way-merge
+![](https://cdn.breizhhardware.fr/FAKA3/BodibOPO89.png/raw)
+
+## Merge conflict
+![](https://cdn.breizhhardware.fr/FAKA3/CUgimImu48.png/raw)
+