Thats really good news, I'm glad you've resolved the problem. I know that arguments between western people can see aggressive with some foul language and some pretty harsh and hurtful things said, but often this is just for impact and attention and isn't really what people mean.
