Went over for a chat and we've sorted it out; we both think we have cleared any existing animosity between us. I've said that if the pressure gets too much or she's upset then I'll be there for her to talk to, but don't want to be a "day-to-day friend" which I think she appreciated, and we were able to have a nice conversation, then left with a hug wishing each other luck at uni.
So overall I think that's the best outcome
