resolving holiday conflict