I was told that the "fight" was the two of them clearing the air.

And just to cover my butt, Luke is supposed to be at Rory's graduation(as in, that was the original plan). But that could easily change(just like anything else), so please don't shoot me or call me a liar if it does. Now don't freak out because I haven't heard of any changes taking place. I just know that anything is possible.