title: How to fix git merge conflict wile keeping both versions?
body: <pre><code>    def main():
  &lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD
      print(&quot;Start of program&gt;&gt;&gt;&gt;&gt;&gt;&gt;&quot;)
  =======
      print(&quot;End of program!&quot;)
  &gt;&gt;&gt;&gt;&gt;&gt;&gt; improvement-to-the-code
  
  main()
  </code></pre>