diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 888e106..9285dad 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -1,9 +1,7 @@
 name: Publish on Merge to Main
 
 on:
-  push:
-    branches:
-      - main
+  workflow_dispatch: 
 
 jobs:
   publish:
@@ -22,9 +20,12 @@ jobs:
       - name: Install dependencies
         run: yarn install --immutable
 
+<<<<<<< HEAD
+=======
       - name: Bump version
         run: yarn version --patch --no-git-tag-version
 
+>>>>>>> main
       - name: Publish to npm
         run: yarn publish --non-interactive
         env:
diff --git a/src/types/api/time.ts b/src/types/api/time.ts
index 4e562b9..8c15ba7 100644
--- a/src/types/api/time.ts
+++ b/src/types/api/time.ts
@@ -16,8 +16,14 @@ export enum ByDay {
   SU = "Sunday",
 }
 
-export type Occasionally = "occasionally";
-export type OccasionalDays = "weekends" | "weekdays";
+export enum Occasionally {
+  OCCASIONALLY = "occasionally",
+}
+
+export enum OccasionalType {
+  WEEKENDS = "weekends",
+  WEEKDAYS = "weekdays",
+}
 
 export enum Hour {
   H00 = "0:00",
@@ -47,20 +53,13 @@ export enum Hour {
   H24 = "24:00",
 }
 
-export type Daytime = [Hour, Hour] | OccasionalDays;
+export type Daytime = [Hour, Hour] | [OccasionalType];
 
 export interface Availability {
   day: ByDay | Occasionally;
   daytime: Daytime;
 }
 
-export enum OccasionalType {
-  UNDEFINED = "undefined",
-  WEEKENDS = "weekends",
-  WEEKDAYS = "weekdays",
-  OCCASIONALLY = "occasionally",
-}
-
 export interface TimedText {
   date: Date;
   text: string;
diff --git a/src/types/api/volunteer.ts b/src/types/api/volunteer.ts
index 1f8d360..c93361a 100644
--- a/src/types/api/volunteer.ts
+++ b/src/types/api/volunteer.ts
@@ -24,7 +24,7 @@ export interface Volunteer {
 }
 
 export interface VolunteerFormData {
-  opportunityId?: Id | undefined;
+  opportunityId?: Id;
   fullName: string;
   phone: string;
   email: string;
@@ -41,6 +41,7 @@ export interface VolunteerFormData {
 }
 
 export interface ApiVolunteerGetList {
+  id: number;
   name: string;
   languages: ApiLanguage[];
   availability: Availability[];