Well, Tohru was talking with Rin and Kagura about how she felt about Kyo, and Kagura punched Tohru telling her she should be telling Kyo how she felt instead of telling her and Rin.
And Rin and Tohru never fought, Shigure used a "fight" between Tohru and Rin as a lie to tell Kyo because they were actually talking about if Tohru was in love with Kyo.