Well, he's calmer. Athena and I went to stop him (Because, you know... I'm big and mighty and can do things like stop wars...). Aphrodite won't talk to anyone, and Ares just mopes around. I'm guessing that's a no on the making up part.
And! I will happily take kisses and/or cookies next time I see you. Yummy. :D