In Goblet of Fire, why did Madame Maxime forgive Hagrid?   
Hagrid was really upset with her while she was aloof and angry with him.  
How was this settled?