title: How to solve conflicts on GitLab?
body: <p>I recently worked with <code>git</code> and there was such a question. I made a <code>merge</code> request from the current <code>branch</code> into <code>master</code>. And received such a message: </p>
  
  <p><a href="https://i.stack.imgur.com/EEDDL.png" rel="noreferrer"><img src="https://i.stack.imgur.com/EEDDL.png" alt="enter image description here"></a></p>
  
  <p>What are the options to allow this, so that the button appeared on the site to accept the <code>merge</code>? If I do local merge then it closes automatically, but I don’t need to. Are there any options?</p>