MMM-carousel stuck with update

[JMac]

I’m getting this error when running the latest update,
MagicMirror@raspberrypi:~/MagicMirror/modules/MMM-Carousel $ git pull
hint: Pulling without specifying how to reconcile divergent branches is
hint: discouraged. You can squelch this message by running one of the following
hint: commands sometime before your next pull:
hint:
hint: git config pull.rebase false # merge (the default strategy)
hint: git config pull.rebase true # rebase
hint: git config pull.ff only # fast-forward only
hint:
hint: You can replace “git config” with “git config --global” to set a default
hint: preference for all repositories. You can also pass --rebase, --no-rebase,
hint: or --ff-only on the command line to override the configured default per
hint: invocation.
Updating fb51858…f14e5e9
error: Your local changes to the following files would be overwritten by merge:
package-lock.json
Please commit your changes or stash them before you merge.
Aborting

I’ve tried - git reset package-lock.json

as was recommended with a similar issue with MMM-CalendarEXT3 but this isn’t offering any steps forward.
Any thoughts?
Cheers.

[sdetweil]

@JMac just
rm package-lock.json

then the git pull should work

[JMac]

@sdetweil Sorry for the late response, That’s done the job.
If I get the package-lock.json during any other update, will this work to allow the update to continue?

[sdetweil]

@JMac yes