awwwwww did you two kiss and make up?