diff --git a/assets/components.css b/assets/components.css
index eab469589..ebebcc238 100644
--- a/assets/components.css
+++ b/assets/components.css
@@ -1,3 +1,3 @@
 .fit {
-  min-height: calc(100vh - 88px - 41px);
+  min-height: calc(100vh - 88px);
 }
diff --git a/pages/_app.tsx b/pages/_app.tsx
index b03d17cb3..a814e9a65 100644
--- a/pages/_app.tsx
+++ b/pages/_app.tsx
@@ -1,11 +1,5 @@
-<<<<<<< HEAD
-import '@assets/global.css'
-import '@assets/tailwind.css'
-import '@assets/utils.css'
-import 'keen-slider/keen-slider.min.css'
-=======
 import '@assets/main.css'
->>>>>>> master
+import 'keen-slider/keen-slider.min.css'
 
 // To be removed
 import 'animate.css'