I hope someone solves the merge conflict problem once and for all. Each time there’s a merge conflict the project stops for days as no one knows how to resolve them. In the end the solution always is to delete the git repository and clone it again.
git pull --rebase can be used to get local changes on top of new remote work.
But just deleting (or renaming the branch) and checking out again is all that is necessary if you end up in a messed up merge.