I think even though Kira kissed the other girl, Kira wasn't into it. She seemed to be conflicted during and after the kiss. I think the problem between the two is that Nina wants to proceed and Kira does not. Nina did most of the talking tonight, and it looked to me like she was trying to convince Kira to go along with it.
While they seemed to be at a better point after the Face Off, I think Kira will continue to have a problem with this, thus it is not over in my opinion.