What does this merge conflict mean and how to resolve it?
<p>I am using git. And restore stashed changes but get CONFLICT</p>

<pre><code>$ gn
# On branch feature/improve_list
# Changes to be committed:
#   (use "git reset HEAD &lt;file&gt;..." to unstage)
#
#1  modified:   ../lib/Devel/DebugHooks.pm
#
# Unmerged paths:
#   (use "git reset HEAD &lt;file&gt;..." to unstage)
#   (use "git add &lt;file&gt;..." to mark resolution)
#
#2  both modified:   ../lib/Devel/DebugHooks/Commands.pm
#
</code></pre>

<p>Content of conflict:</p>

<pre><code>$gd 2
index e043e7f,9cb31e5..0000000
--- a/lib/Devel/DebugHooks/Commands.pm
+++ b/lib/Devel/DebugHooks/Commands.pm
@@@ -130,12 -130,12 +130,21 @@@ sub _list 
         else {
             printf $DB::OUT  DB::can_break( $file, $line ) ? ' x' : '  ';
         }
++&lt;&lt;&lt;&lt;&lt;&lt;&lt; Updated upstream


         # Print source line number
         print $DB::OUT "$line:";


++=======
++
++
++       # Print source line number
++       print $DB::OUT "$line:";
++
++
++&gt;&gt;&gt;&gt;&gt;&gt;&gt; Stashed changes
         # Print source line
         (my $sl =  $source-&gt;[ $line ]) =~ s/\t/    /g; #/
         $sl =  " $sl"   if length $sl &gt; 1; # $sl(source line) have at least "\n"
</code></pre>

<p>Why I got CONFLICT? everything is same for me<br>
How I should edit this file to resolve this conflict (I do not understand what to keep, what to remove and what funny comments mean)<br>
and which git commands I should use to mark this CONFLICT as resolved?</p>