diff --git a/components/Message.vue b/components/Message.vue
index 536487c..919120d 100644
--- a/components/Message.vue
+++ b/components/Message.vue
@@ -69,9 +69,6 @@ import type { MessageProps } from '~/types/props';
 import generateIrcColor from '~/utils/generateIrcColor';
 import MessageMedia from './MessageMedia.vue';
 import MessageReply from './UserInterface/MessageReply.vue';
-=========
-import generateIrcColor from '~/utils/generateIrcColor';
->>>>>>>>> Temporary merge branch 2
 
 const props = defineProps<MessageProps>();