fixing git merge error.

app.py

@@ -80,10 +80,6 @@ class ArtemisiaTheme(Base):
             neutral_hue=colors.gray,
             **kwargs
         )
-
-<<<<<<< HEAD
-=======
-        # Set text colors to white
         self.set(
             body_text_color="#ffffff",
         )
@@ -107,7 +103,6 @@ class ArtemisiaTheme(Base):
         self.error_text_color = "#ff5252"
 
 
->>>>>>> refs/remotes/origin/main
 # Custom CSS for exact layout and styling
 custom_css = """
 body {