Fixing matrix
Fixed merge conflict with row_reduction