title: Why GitHub makes me resolve conflicts that are actually additions?
body: <p>I'm working on some project and I just created a repo and made initial commit. Then I edited eslint config (added new rule), created PR to merge it in master but GitHub wants me to resolve this &quot;conflict&quot;.</p>
  <p><a href="https://i.stack.imgur.com/ckdw0.png" rel="nofollow noreferrer"><img src="https://i.stack.imgur.com/ckdw0.png" alt="enter image description here" /></a></p>
  <p>Why is it even a conflict? It's just a simple addition which doesn't have to be resolved manually at all. Did I miss something in repository configuration?</p>