diff --git a/styles.css b/styles.css
index 14ae21f..2b630f0 100644
--- a/styles.css
+++ b/styles.css
@@ -218,11 +218,14 @@ li.message {
     padding: 0 2em;
 
     z-index: 1;
+<<<<<<< HEAD
     font-size: 1em;
 }
 
 #input-panel input:focus {
     outline: none;
+=======
+>>>>>>> 021d12d (feat: update input style)
 }
 
 button {