There is only 1 solution for a matter such as this.
I think it would be in everyone's best interest if you two fight at the State meet......
Superheavyweights don't call and make up.....they hurt one another!
I'll buy the winner a meet t-shirt and a hot-dog.....