In my case, I had to stash the changes on my local branch, then merge with the remote branch, then when I applied my stashed changes back, the merge conflict window opened.

Hope this helps!