Unable to upgrade MM to 2.27.1

[Johanba]

Hi

Getting this error
pi@raspberrypi:~/MagicMirror $ git pull && npm install
error: Pulling is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use ‘git add/rm ’
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.

Will appreciate any assistance

[DJBOOB66]

Try

cd ~/MagicMirror
git reset --hard HEAD
git pull
npm install

[sdetweil]

@djboob66 wait.

why unmerged files?

git status

to see what is going on