title: How to resolve merge conflict when the conflicting file are all package.json file?
body: <p>I just git push my code to remote from local and build a new pull request to merge them to where I fork.
  But I can not merge pull request because there have conflicts must be resolved.
  All the conflicting files are the package.json file.</p>
  
  <p><a href="https://i.stack.imgur.com/2gnYJ.png" rel="nofollow noreferrer"><img src="https://i.stack.imgur.com/2gnYJ.png" alt="enter image description here"></a></p>