diff --git a/print.css b/print.css
index 02f5330..22b7c4d 100644
--- a/print.css
+++ b/print.css
@@ -42,12 +42,9 @@ mark {
   display: block;
   padding-left: 0.5cm;
   font-family: "DuctusRegular";
-<<<<<<< HEAD
   margin-bottom: 1cm;
   margin-right: 1cm;
-=======
   white-space: normal;
->>>>>>> f838a40ff28785f7358a6f3abf37b3cf89ad0d25
 }
 
 h1,