fixing merge conflicts 3 deleted comments in mat model