Just cause they solved the issue doesn't mean they should be forgiven. They caused a big ass misunderstanding, and you were attacked. Hello? He was trying to ruin your relationship, and you're just "yay, you two got together." What the actual fuck?