errors when running update.sh

[KnoAll]

I'm getting errors when running update.sh

error: You have not concluded your merge (MERGE_HEAD exists).
hint: Please, commit your changes before merging.
fatal: Exiting because of unfinished merge.

I am not making any changes to XNP, just a user, so i have no changes to merge

[MoneroOcean]

Try to reinstall xmr node proxy. I had to fix some commits that caused issues with other repo copies.

[djfinch]

... or try ...

git fetch && git reset --hard origin/master

[MoneroOcean]

@djfinch thanks!

[KnoAll]

@djfinch your command did the trick! update is running. thanks everyone!