diff --git a/Doc/Sd1/Ref/ObjectsAndClasses/Git/gitMerge.gif b/Doc/Sd1/Ref/ObjectsAndClasses/Git/gitMerge.gif
new file mode 100644
index 0000000000000000000000000000000000000000..8e01a00ef4c902b7ef40748fde700830f057b20b
Binary files /dev/null and b/Doc/Sd1/Ref/ObjectsAndClasses/Git/gitMerge.gif differ
diff --git a/Doc/Sd1/objectsClasses.xml b/Doc/Sd1/objectsClasses.xml
index 0eeb6763aa61d57d78f7eb3d73c59bb1112070ce..c5c8c7d33fc617b9e3756fb79eb3830138bd5702 100644
--- a/Doc/Sd1/objectsClasses.xml
+++ b/Doc/Sd1/objectsClasses.xml
@@ -12670,6 +12670,17 @@ public class Print {
         </calloutlist>
       </figure>
 
+      <figure xml:id="sd1_fig_gitMergeBattle">
+        <title>Struggling for resolution</title>
+
+        <mediaobject>
+          <imageobject>
+            <imagedata fileref="Ref/ObjectsAndClasses/Git/gitMerge.gif"
+                       scale="200"/>
+          </imageobject>
+        </mediaobject>
+      </figure>
+
       <figure xml:id="sd1_fig_gitManualMerge">
         <title>Merging <filename>Print.java</filename> manually</title>