fix matrix.csv and included merge in versioning