Maybe, just maybe, it would be a good thing to talk to her about it...civil like, you know.
I would go on your trip and enjoy it! Disney is the happiest place on earth, right?!
It just might be the place to either work on this issue or to let it go for a while.