Resolving conflicts in Matt.html

@lalogf Resolving conflicts in Matt.html