diff --git a/admin/src/components/Overlay.vue b/admin/src/components/Overlay.vue
index 2a9bcd1ce..c359178ec 100644
--- a/admin/src/components/Overlay.vue
+++ b/admin/src/components/Overlay.vue
@@ -38,8 +38,13 @@
       <b-container>
         <b-row>
           <b-col>
+<<<<<<< Updated upstream
             <b-button size="md" variant="danger" class="m-3" @click="$emit('overlay-cancel')">
               {{ $t('overlay.confirm.cancel') }}
+=======
+            <b-button size="md" variant="info" class="m-3" @click="$emit('overlay-cancel')">
+              {{ $t('overlay.cancel') }}
+>>>>>>> Stashed changes
             </b-button>
           </b-col>
           <b-col class="text-right">
diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue
index 0a6b5ca6e..c7ce9399d 100644
--- a/admin/src/pages/CreationConfirm.vue
+++ b/admin/src/pages/CreationConfirm.vue
@@ -1,7 +1,31 @@
 <template>
   <div class="creation-confirm">
     <div v-if="overlay" id="overlay" @dblclick="overlay = false">
+<<<<<<< Updated upstream
       <overlay :item="item" @overlay-cancel="overlay = false" @confirm-creation="confirmCreation" />
+=======
+      <overlay :item="item" @overlay-cancel="overlay = false">
+        <template #title>
+          {{ $t(overlayTitle) }}
+        </template>
+        <template #text>
+          <p>{{ $t(overlayText) }}</p>
+        </template>
+        <template #question>
+          <p>{{ $t(overlayQuestion) }}</p>
+        </template>
+        <template #submit-btn>
+          <b-button
+            size="md"
+            v-bind:variant="overlayIcon"
+            class="m-3 text-right"
+            @click="overlayEvent"
+          >
+            {{ $t(overlayBtnText) }}
+          </b-button>
+        </template>
+      </overlay>
+>>>>>>> Stashed changes
     </div>
     <open-creations-table
       class="mt-4"
@@ -135,6 +159,36 @@ export default {
         { key: 'deny', label: this.$t('deny') },
       ]
     },
+<<<<<<< Updated upstream
+=======
+    overlayTitle() {
+      return `overlay.${this.variant}.title`
+    },
+    overlayText() {
+      return `overlay.${this.variant}.text`
+    },
+    overlayQuestion() {
+      return `overlay.${this.variant}.question`
+    },
+    overlayBtnText() {
+      return `overlay.${this.variant}.yes`
+    },
+    overlayEvent() {
+      return this[`${this.variant}Creation`]
+    },
+    overlayIcon() {
+      switch (this.variant) {
+        case 'confirm':
+          return 'success'
+        case 'deny':
+          return 'warning'
+        case 'delete':
+          return 'danger'
+        default:
+          return 'info'
+      }
+    },
+>>>>>>> Stashed changes
   },
   apollo: {
     PendingContributions: {