diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue
index c7ce9399d..1c5a60c83 100644
--- a/admin/src/pages/CreationConfirm.vue
+++ b/admin/src/pages/CreationConfirm.vue
@@ -1,9 +1,6 @@
 <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) }}
@@ -25,7 +22,6 @@
           </b-button>
         </template>
       </overlay>
->>>>>>> Stashed changes
     </div>
     <open-creations-table
       class="mt-4"