Stage-2 tau: Add cluster merging