If your GF was upset thinking you were flirting, it probably wouldn't have ended up badly if something had of happened.

If it's a threesome you both want, maybe find a girl that's not so involved (not your gf's best friend). That way there is no weirdness between you, the gf, and the best friend...