title: Git merge: I do not understand nothing
body: <p>I work on a Django project with git and I am lost.</p>
  
  <p><strong>In local</strong> I have 3 branch:</p>
  
  <ul>
  <li>master</li>
  <li>feature/4</li>
  <li>feature/6 (derived from feature/4)</li>
  </ul>
  
  <p>so my most advance branch is feature/6</p>
  
  <p>I would like to merge with master but I have conflicts I do not manage to resolve</p>
  
  <p><strong>In my remote repository (Gitlab)</strong>, I push my feature/6 branch and make a merge request. </p>
  
  <p>But due ton conflict, I can't merge and Gitlab do not let me resolve conflict (no button available)</p>
  
  <p>what should I do?</p>