NPM

• Node

Fix a Merge Conflict

source

git checkout branch
git merge origin/main
# ignore merge conflicts in lockfile
npm install
# add and push