curdate set for Booking/Visa
conflict resolved n merged