fix: resolve merge conflict in config.toml while preserving theme settings

Author: Achal

.streamlit/config.toml

@@ -2,10 +2,13 @@
 developmentMode = false
 
 [server]
+maxUploadSize =  200 #MB
 port = 8501 # should be same as configured in deployment repo
 
 [theme]
+# The preset Streamlit theme that your custom theme inherits from. One of "light" or "dark".
 base = "light"
+
 # Primary accent color for interactive elements.
 primaryColor = "#29379b"