diff --git a/style.css b/style.css
index 10903aa..84159d3 100644
--- a/style.css
+++ b/style.css
@@ -40,12 +40,9 @@ textarea{
   font-size: 0.9em;
   color: inherit;
 }
-<<<<<<< HEAD
 #decCont{
   font-family: monospace;
 }
-=======
->>>>>>> adb3bd3ecf2ebfd3e1a158cb62184045edb7bb7e
 button{
   display: block;
   margin-left: auto;