history: I was so upset when my friend lied to me about  something, I yelled at her. My friend lied to me and I was so upset I yelled at her. I'm sorry_comma_ did everything get resolved?
current: Eventually but I was sure mad at first.
next: I'm glad everything worked out.