Pulling commits after fixing a merge conflict says that there are conflicts left to resolve

### Describe the bug
If you have a merge conflict in your repository either by merging from a branch into another or by restoring stashed changes (my situation) and you fix them, you will get an error when pulling commits from the repository saying that there are conflicts left to resolve. This is obviously not true since you have fixed them and the affected file(s) have a green tick next to them

### Version & OS
GitHub version 2.7.2 and Windows 10 version 20H2 build 19042.870

### Steps to reproduce the behavior

1. Create a merge conflict in your working repository. This can easily be done by changing a file, stashing it then committing changes to that same file (and lines) and restoring the stash
2. Have someone else send a commit to your repository (or make one yourself through a source other than GitHub Desktop)
3. Click the pull origin button.
4. You should get an error saying there are merge conflicts left to resolve which doesn't let you pull the commits

### Expected behavior
You pull the commits properly without any issues

### Actual behavior
You're not allowed to pull the commits from the source due to the aforementioned bug

### Screenshots
Unfortunately, I couldn't get a screenshot of the message, will do if it happens again.

### Logs
[2021-04-07.desktop.production.log](https://github.com/desktop/desktop/files/6274208/2021-04-07.desktop.production.log)
The bug can be found at 20:01:04

### Additional context
The files in my working tree were completely different from the changed files in the commit I was trying to pull, so I believe the issue didn't come from that.