3 ms·

They say in the article: the correct resolution of a merge depends on the context. Automatic resolution may introduce bugs!