Version:           4.8 (using Devel) 
OS:                Linux

For a "common" user the conflict resolution dialog is senseless and rather scary. I myself (not a newbie) have no clue on which modification should be choosen each time and in fact I pick totally at random. In real non-developer world conflicts should either be impossibile or be resolved automatically.

With large modifications (like apply all filters to a large set of messages) the dialog may pop up several times: there should eventually be a "always pick this choice and don't ask me again" option.

Reproducible: Sometimes

Steps to Reproduce:
Apply a large set of filters to a large number of messages. Browse around while the filtering agent is doing his job. Apply other filters, delete messages etc... the conflict resolution dialog will eventually popup.

Actual Results:  
Conflict Resolution Dialog appears.

Expected Results:  
No conflict... or conflict automatically resolved.