Merge pull request #56 from kir-rescomp/dev

add git resolve merge conflict episode header image to correct .md file

Author: DininduSenanayake

docs/6.conflicts.md

@@ -1,5 +1,9 @@
 #<h1 align="center">6. Resolving Merge Conflicts</h1>
 
+<p align="center">
+    <img src="../images/resolving_merge_conflicts.png" alt="drawing" width="400"/>
+</p>
+
 Merge conflicts happen when Git can't automatically combine changes. Don't panic—they're normal and easy to fix!
 
 ---