Friend advice

So i am in 7th grade and i used fo be friends with this girl but then she cyberbullied me and i forgave her in 6th grade then she thought we were friends told her no she kept bugging me finally said yes now in 7th grade we got got in a huge fight and i ignored her completely my other friend started talking to her again and they claim they are ok with each other but i know they are friends anyway my birthday came around and the girl who i dont like and my friend and my other friend decorated my locker and im kindof confused about y the girl i dont like did tht she knows i dont like her she know i think shes mean but she tries to be my friend i gave her 2 chances to make up for lying to me but she lost her chances i honestly dont know wht to do im so confused and i dont want there to be mpre drama plz help