are matt and rachel back together