4 ms·

For sure! In this case there wasn't an actual conflict, just a bad merge, and I just had not considered this at all before.