Error on Updating to v2.6.0

[swvalenti]

Keep getting this error…running node 9.11.2

pi@raspberrypi:~/MagicMirror $ git pull && npm install
Updating 6db61b4…de57daa
error: Your local changes to the following files would be overwritten by merge:
package-lock.json
vendor/package-lock.json
Please commit your changes or stash them before you merge.
Aborting

[sdetweil]

Erase both lock files, and go again

[swvalenti]

@sdetweil that worked thank you sir!

[dawees]

thanks a lot working for me