friendship tension

A few nights ago, my best friend and I had an argument. He had kind of an anxious breakdown, and he snapped and yelled at me. He's doing better now, but everything has been really tense since then. Last night we tried to talk through everything, because we both just want everything to go back to being normal. It seemed like we're on the same page, but there's still tension. I don't know what to do- I really value his friendship and I don't want to lose that. Any advice?