diff --git a/assets/src/components/layout/logo.svg b/assets/src/components/layout/logo.svg
index af77a177..858d75f6 100644
--- a/assets/src/components/layout/logo.svg
+++ b/assets/src/components/layout/logo.svg
@@ -1,192 +1,52 @@
-<<<<<<< HEAD
-
-
-=======
->>>>>>> dev
+
\ No newline at end of file