In the past couple of releases, the merge tool has inverted which source to use during a conflict.

When you click on "resolve using theirs", it uses mine.  If I pick "resolve using mine" it uses theirs.