fix: a rare race condition in the row merger (#1939)

fix: a rare race condition in the row merger (#1939) #2