Update papermerge from github

[jorisvc]

Hi,

I'm currently running Papermerge version 1.5.5 on Debian 10. (baremetal)
I want to update my Papermerge to the latest version. The upgrading section in the documentation is very limited https://docs.papermerge.io/Installation/upgrading.html

Regarding to the instructions, i tried:

git pull

remote: Enumerating objects: 41, done.
remote: Counting objects: 100% (41/41), done.
remote: Compressing objects: 100% (17/17), done.
remote: Total 41 (delta 26), reused 38 (delta 23), pack-reused 0
Unpacking objects: 100% (41/41), done.
From https://github.com/ciur/papermerge
   444d7f96..5a3e465f  master       -> origin/master
 * [new branch]        stable/2.0.x -> origin/stable/2.0.x
There is no tracking information for the current branch.
Please specify which branch you want to merge with.
See git-pull(1) for details.

    git pull <remote> <branch>

If you wish to set tracking information for this branch you can do so with:

    git branch --set-upstream-to=origin/<branch> v1.5.3

git pull origin v2.0.0rc38

...
Auto-merging changelog.md
CONFLICT (content): Merge conflict in changelog.md
Auto-merging .gitignore
Automatic merge failed; fix conflicts and then commit the result.

Can someone guide me?

Thanks