diff --git a/src/routes/public/certificates/+page.svelte b/src/routes/public/certificates/+page.svelte
index 5f7e50f..39e8a98 100644
--- a/src/routes/public/certificates/+page.svelte
+++ b/src/routes/public/certificates/+page.svelte
@@ -1,9 +1,5 @@
 <script lang="ts">
-<<<<<<< HEAD
 	import { Col, Container, Row, Alert } from 'sveltestrap';
-=======
-	import { Col, Container, Row } from 'sveltestrap';
->>>>>>> main
 	import PublicCertificateCard from '$lib/PublicCertificateCard.svelte';
 	import type { PageData } from './$types';