diff --git a/Frontend/src/style.css b/Frontend/src/style.css
index 5fe2bce..c85c2d2 100644
--- a/Frontend/src/style.css
+++ b/Frontend/src/style.css
@@ -2,14 +2,6 @@
 @tailwind components;
 @tailwind utilities;
 
-<<<<<<< HEAD
-.inactive-button {
-    @apply py-2 px-4 h-fit text-slate-400 border border-slate-400 rounded-full
-}
-
-.tool-button {
-    @apply hover:brightness-110 py-2 px-4 h-fit rounded-full bg-gradient-to-r from-blue-400 to-sky-300  dark:text-white dark:from-sky-600 dark:to-sky-800 hover:bg-blue-400
-=======
 @font-face {
     font-family: "Raleway";
     src: url("fonts/Raleway-Variable.ttf");
@@ -26,14 +18,10 @@
 
 .tool-button {
     @apply hover:brightness-110 py-2 px-3 h-fit min-w-fit rounded-full bg-gradient-to-r from-blue-400 to-sky-300  dark:text-white dark:from-sky-600 dark:to-sky-800 hover:bg-blue-400
->>>>>>> 307e732608fca31b60027b417412691ff0e1c2f0
 }
 
 .text-field {
     @apply w-full font-mono dark:text-slate-100 bg-slate-50 dark:bg-gray-600 border border-slate-400 p-2 rounded-lg
-<<<<<<< HEAD
-}
-=======
 }
 
 .file-selector {
@@ -55,4 +43,3 @@
 .tab-active {
     @apply py-2 px-3 h-fit text-slate-700 border-t border-l border-r border-slate-400 rounded-t-2xl bg-gradient-to-r from-blue-400 to-sky-300  dark:text-white dark:from-sky-600 dark:to-sky-800 hover:bg-blue-400
 }
->>>>>>> 307e732608fca31b60027b417412691ff0e1c2f0