May be I am recalling something that I wished was there, but I seem to recall to be able to select all the conflicts and resolve them all with the option to resolve these with mine or theirs. It now seems that I have to click each and every conflict. Am I missing something or was this a feature request I never made :) Regards, Ronald