When there’s a conflict, Git marks them for you in the files. You’ll see sections like this:
* Daniel Pass <email@example.com>
* Kieran Moore
* Kermit the Frog
* Miss Piggy
The first section, HEAD is what you have in your version. The second section, upstream/unmergeable-branch is what Git found in the version you were trying to pull in.