resolved conflict
fixed issue with non .mat files