Oh, I hope you and your friend can make it up. I hate battling with good friends.

Why don't you write a "letter" to your friend and tell her what you're going through? Wouldn't have to send it or anything. Maybe that will give you a different perspective or straighten out some of the turmoiled feelings, etc. so they're more bearable.