IELTS
You should say:When this happenedWho you disagreed withWhat you and your friend argued aboutand if you two solved the disagreement in the end.