Merged vacation  changes