The second time you fight Magus, you are given the choice of "Yes, I want to fight you" and "No, I don't". If you choose "No", not only will you not have to fight Magus, but he will also join your party.