First of all, hate is like a poison! Sounds to me that she is being friendly because she doesn't want to be enemies and she has forgiven everything. You should too. Fight is over and done with. Be the better person and shake hands and forget about it.
She's being the better person at this time. Show her that you are the same. Never hate ! It's bad for your mental and physical being.