conflict recovered

Conflict in holiday settings view controller rectified