Thank you merry, your advice really helped.
I'm trying to get to know her as much as possible so we can be friendly and not so awkward when the three of us are out together.
She and I both share a slight obsession with Pokemon, so we've been talking about that. I'm glad things are finally looking up.