I have booked a Short Break, do I still need to pre-book entry with my Merlin Pass?