matt and maggie hugged and made up