5 ms·Merge conflicts never end when I think they will.by rev_bird 11y agoMerge conflicts never end when I think they will.