It seems to me when I've run into it that I just clicked on edit marriage information (which opens a new tab), fixed the error, then just went back to the original tab and clicked save again, and I was all set, no more warning, and I didn't get an edit conflict.