If there are merge conflicts when running git pull, Git will stop the merge process and prompt you to resolve the conflicts. You need to manually edit the conflicted files to resolve the conflicts and then complete the merge with the following commands:
git add <resolved-files>
git commit
