2 ms·

I was talking about a solution to the problem you quoted: > fixing the same conflict repeatedly is annoying