How do I resolve a merge conflict with features? This might seem basic, but I am new to Drupal (and, to and extent, git).

I've made some changes to a Feature and downloaded its files to be pushed up to the remote server with git. However, I get the following merge conflict:

&lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD
  $pane-&gt;uuid = '992af322-74c5-4a5c-a261-1e73677d3645';
  $display-&gt;content['new-992af322-74c5-4a5c-a261-1e73677d3645'] = $pane;
  $display-&gt;panels['content'][2] = 'new-992af322-74c5-4a5c-a261-1e73677d3645';
=======
  $pane-&gt;uuid = 'bf806592-c85c-4155-a97c-516f72427e4e';
  $display-&gt;content['new-bf806592-c85c-4155-a97c-516f72427e4e'] = $pane;
  $display-&gt;panels['content'][2] = 'new-bf806592-c85c-4155-a97c-516f72427e4e';
  $pane = new stdClass();
&gt;&gt;&gt;&gt;&gt;&gt;&gt; refs/heads/my-branch


I would know what to do with a conflict with other code, but this is all very foreign to me and I don't want to break anything.

Would anyone know the best course of action here?
Check the panes with the following uuid "bf806592-c85c-4155-a97c-516f72427e4e" 
and "992af322-74c5-4a5c-a261-1e73677d3645".
Check which one should not be there and remove it from the code.