Moved actor merge from bio to edit.

components/actors/bio.vue

@@ -374,29 +374,17 @@
 						:href="`/actor/edit/${actor.id}/${actor.slug}`"
 						target="_blank"
 						class="link"
-					>Edit bio</a>
+					>Edit</a>
 
 					<a
 						:href="`/actor/revs/${actor.id}/${actor.slug}`"
 						target="_blank"
 						class="link"
 					>Revisions</a>
-
-					<span
-						v-if="user && user.role !== 'user'"
-						class="link"
-						@click="showMergeDialog = true"
-					>Merge</span>
 				</div>
 			</li>
 		</ul>
 
-		<Merge
-			v-if="showMergeDialog"
-			:actors="[actor]"
-			@close="showMergeDialog = false"
-		/>
-
 		<div class="descriptions-container">
 			<div
 				v-if="descriptions.length > 0"
@@ -457,8 +445,6 @@ import formatTemplate from 'template-format';
 import getPath from '#/src/get-path.js';
 import { formatDate } from '#/utils/format.js';
 
-import Merge from '#/components/actors/merge.vue';
-
 const expanded = ref(false);
 
 const pageContext = inject('pageContext');
@@ -545,8 +531,6 @@ const aliases = Object
 	.toSorted(([, countA], [, countB]) => countB - countA)
 	.map(([alias]) => alias)
 	.filter((alias) => alias !== props.actor.name);
-
-const showMergeDialog = ref(false);
 </script>
 
 <style>
@@ -898,7 +882,7 @@ const showMergeDialog = ref(false);
 	display: none;
 	justify-content: center;
 	position: absolute;
-	z-index: 10;
+	z-index: 1;
 	bottom: -.25rem;
 }