When a conflict occurs you have the an option to resolve it using my version or theirs. Regardless which you click it will show the following text:

https://i.imgur.com/TAW9yre.png

For those that do not wish to click the link read below:

"Please confirm you want to resolve these files using their state as at this commit: 'id'"

It will always say "their" regardless if you click on 'Resolve using mine' which can be confusing.