3 ms·Fixing merge conflicts is completely broken for me ever since they introduced it.by apple4ever 8y agoFixing merge conflicts is completely broken for me ever since they introduced it.