diff --git a/package.json b/package.json
index 59a3488ea..ffa5066e6 100644
--- a/package.json
+++ b/package.json
@@ -250,4 +250,4 @@
       ]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/yarn.lock b/yarn.lock
index 579a4c167..de22c0559 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1030,11 +1030,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
 "@mantine/core@npm:^6.0.21":
-=======
-"@mantine/core@npm:^6.0.0":
->>>>>>> dev
   version: 6.0.21
   resolution: "@mantine/core@npm:6.0.21"
   dependencies:
@@ -1052,11 +1048,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
 "@mantine/dates@npm:^6.0.21":
-=======
-"@mantine/dates@npm:^6.0.0":
->>>>>>> dev
   version: 6.0.21
   resolution: "@mantine/dates@npm:6.0.21"
   dependencies:
@@ -1070,11 +1062,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
 "@mantine/dropzone@npm:^6.0.21":
-=======
-"@mantine/dropzone@npm:^6.0.0":
->>>>>>> dev
   version: 6.0.21
   resolution: "@mantine/dropzone@npm:6.0.21"
   dependencies:
@@ -1089,11 +1077,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
 "@mantine/form@npm:^6.0.21":
-=======
-"@mantine/form@npm:^6.0.0":
->>>>>>> dev
   version: 6.0.21
   resolution: "@mantine/form@npm:6.0.21"
   dependencies:
@@ -1105,11 +1089,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
 "@mantine/hooks@npm:^6.0.21":
-=======
-"@mantine/hooks@npm:^6.0.0":
->>>>>>> dev
   version: 6.0.21
   resolution: "@mantine/hooks@npm:6.0.21"
   peerDependencies:
@@ -1118,11 +1098,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
 "@mantine/modals@npm:^6.0.21":
-=======
-"@mantine/modals@npm:^6.0.0":
->>>>>>> dev
   version: 6.0.21
   resolution: "@mantine/modals@npm:6.0.21"
   dependencies:
@@ -1136,11 +1112,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
 "@mantine/next@npm:^6.0.21":
-=======
-"@mantine/next@npm:^6.0.0":
->>>>>>> dev
   version: 6.0.21
   resolution: "@mantine/next@npm:6.0.21"
   dependencies:
@@ -1154,11 +1126,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
 "@mantine/notifications@npm:^6.0.21":
-=======
-"@mantine/notifications@npm:^6.0.0":
->>>>>>> dev
   version: 6.0.21
   resolution: "@mantine/notifications@npm:6.0.21"
   dependencies:
@@ -1173,11 +1141,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
 "@mantine/prism@npm:^6.0.21":
-=======
-"@mantine/prism@npm:^6.0.19":
->>>>>>> dev
   version: 6.0.21
   resolution: "@mantine/prism@npm:6.0.21"
   dependencies:
@@ -1221,11 +1185,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-<<<<<<< HEAD
 "@mantine/tiptap@npm:^6.0.21":
-=======
-"@mantine/tiptap@npm:^6.0.17":
->>>>>>> dev
   version: 6.0.21
   resolution: "@mantine/tiptap@npm:6.0.21"
   dependencies:
@@ -7606,7 +7566,6 @@ __metadata:
     "@emotion/react": ^11.10.6
     "@emotion/server": ^11.10.0
     "@jellyfin/sdk": ^0.8.0
-<<<<<<< HEAD
     "@mantine/core": ^6.0.21
     "@mantine/dates": ^6.0.21
     "@mantine/dropzone": ^6.0.21
@@ -7617,18 +7576,6 @@ __metadata:
     "@mantine/notifications": ^6.0.21
     "@mantine/prism": ^6.0.21
     "@mantine/tiptap": ^6.0.21
-=======
-    "@mantine/core": ^6.0.0
-    "@mantine/dates": ^6.0.0
-    "@mantine/dropzone": ^6.0.0
-    "@mantine/form": ^6.0.0
-    "@mantine/hooks": ^6.0.0
-    "@mantine/modals": ^6.0.0
-    "@mantine/next": ^6.0.0
-    "@mantine/notifications": ^6.0.0
-    "@mantine/prism": ^6.0.19
-    "@mantine/tiptap": ^6.0.17
->>>>>>> dev
     "@next/bundle-analyzer": ^13.0.0
     "@next/eslint-plugin-next": ^13.4.5
     "@nivo/core": ^0.83.0