diff --git a/webapp/layouts/default.vue b/webapp/layouts/default.vue
index 42e11e23d..a1e4b9921 100644
--- a/webapp/layouts/default.vue
+++ b/webapp/layouts/default.vue
@@ -228,11 +228,7 @@ export default {
 
 .main-container {
   padding-top: 6rem;
-<<<<<<< HEAD
   padding-bottom: 5rem;
-=======
-  padding-botton: 5rem;
->>>>>>> 4dfb16cb7cda8291370749a058ce85750364abfd
 }
 
 .main-navigation {