RubyMine auto resolve conflict

Hi.

Once RubyMine asked me how I want to deal with the conflicts, and I said that I wanted RubyMine to do it for me when possible.
But I got issues now,because some lines are deleted when they should not.

I would like to know where I can revert this choice, I found nothing on the IDE settings so far.

Thanks.