re-added time off color class from merge conflict