I didn't read 98% of this thread so I will ask:

Did you two kiss/make-up??? (figuratively speaking of course)

If so that would be nice.