Optimizing our approach to tx merging - using cond vars instead of hard locks