Should I be upset?

We have been together for over 5.5 years! We are highschool sweethearts. In September him and I were struggling we had a huge argument and I moved out. 3 weeks later he messaged me telling me how much he loved me and how he has this whole trip planned out for New Years to New York(where we met) and he planned on asking me to marry him. We have since worked through our problems and we are on good terms again. I asked him last night 'What are we doing for Christmas and New Years?' and he responded with 'i did have something planned out but not anymore.' and of course I got quiet and wouldn't say anything because I was working through my thoughts... I'm not sure how I feel about it.. :( I don't have many people to talk to about this.