PHPStorm resolve merge conflict

Hello,

During the merge, the dialog with 3 choises is opened: Accept Yours, Accept Theirs and Merge. I've clicked Accept Yours, then I clicked 'Commit and Push' icon, but it shows a popup 'No changes detected'. 

How can I overcome this issue and push the files that were merged, despite the fact that the files did not really been changed (after 'Acctept Yours' click)? With Sourcetree it works perfectly, but I would like to do it with PHPStorm.

I've read all the relative topics on this forum but did not found a working solution. Maybe can someone help?

Thanks..