If the source is synchronous, we'll hold the lock for the entire time.

This was already there, so not holding up the merge, but we should resolve this.