Comment by martinvonz

I agree, but that doesn't seem relevant. I did not say the jj automatically resolves conflicts.