After our first beef we kiss and makeup