title: Bitbucket - Fix merge conflicts
body: <p>I know that there are some questions with this topic but out of them I didn't get a answer for my problem.</p>
  
  <p>I am working with Bitbucket and I am not sure if I am always doing all corretly because I am very new at Bitbucket</p>
  
  <p>I have a conflict at merging a branch into master.</p>
  
  <pre><code>    // Check if a filter is set
      if(filter_id) {
          var filter = filter_id;
  +&lt;&lt;&lt;&lt;&lt;&lt;&lt; destination:b9a9e6b6e3b21d06f9f726ba8a3b24c221c695f4
      }
      else {
          var filter = -1;
      }
  +=======
  +   }
  +   else {
  +       var filter = -1;
  +   }
  +&gt;&gt;&gt;&gt;&gt;&gt;&gt; source:8ab52e4f8401ac8b5b68682d888e7538a7183216
  </code></pre>
  
  <p>Do you have any idea how I can fix this error?
  Maybe by modifying the code?</p>
  
  <p>What does this conflict mean in general? What have I done wrong?</p>
  
  <p>Thank you for your answers!</p>