It appears the holiday episode of Glee will have Finn and Santana settle all of their issues.
Finn will ask Santana to help him pick out a Christmas gift for Rachel and she advises him not to get the necklace (which according to her sends the wrong message) and get earrings instead.
