I'd like to re-enable the warning dialog when the merge conflict appear.
There seems to have no option regarding the merge conflict warning dialog in the Setting.
Thank you very much!
