Between Prim and Katniss? Because I thought they were going to fight before the arena exploded? Or with Katniss and Johanna? I assume they would fight during training, at the ball, or in the arena, but then resolve their difference and try to find that they have some things in common.