Update matrix.h
Merge conflict