3 ms·Sounds like that merge conflict would suck to resolve.by withinboredom 4y agoSounds like that merge conflict would suck to resolve.