Auto-merging package-lock.json : <pre><code>git merge --no-ff account-creation
</code></pre>

<p>Auto-merging package-lock.json
CONFLICT (content): Merge conflict in package-lock.json
Automatic merge failed; fix conflicts and then commit the result.</p>

<p>Any idea regarding this issue ?</p>
