updates to clustering
updates to matrix
conflict merge