but i was leaning toward re-merging those locks, because i feel like even when we did the split, it wasn't a huge win, and we landed it because we anticipated further wins (which mostly have happened elsewhere)