Should I go back to being best friends with her? HELP?

We have been best mates for like 10 years. And today we kind of got into a jokey argument which turned into a serious one. So like of course, for the rest of the day, I hung out with other people (the people me and her use to make fun of) and I felt like I was becoming more like friends with them. So should I even go bother go back to her, even though she's in all my classes and my other best mates hang with her, or she I join a completely new group?