adding sold out text
removing sold out dates
fixing merge conflicts