Fixed merge conflict (that were acidentally pushed), fixed a typo, fixed a bug in production.

src/handlers/homepage.rs

@@ -100,7 +100,7 @@ pub async fn homepage() -> impl IntoResponse {
                 </h1>
                 <ul>
                     <li>📖 Explore the API using <a href="/swagger">Swagger UI</a> or import the <a href="/openapi.json">OpenAPI spec</a>.</li>
-                    <li>🩺 Ensure your Docker setup is reliable, by pointing its healthcheck too <a href="/health">/health</a>.</li>
+                    <li>🩺 Ensure your Docker setup is reliable, by pointing its healthcheck to <a href="/health">/health</a>.</li>
                 </ul>
                 <a href="https://github.com/Riktastic/Axium" class="github-link" target="_blank">
                     <svg height="20" aria-hidden="true" viewBox="0 0 16 16" version="1.1" width="20" data-view-component="true" fill="currentColor">

src/main.rs

@@ -57,7 +57,6 @@ async fn main() {
     tracing_subscriber::fmt::init();  // Initialize the logging system
 
     println!("{}", r#"
-<<<<<<< HEAD
            db                      88                                   
           d88b                     ""                                   
          d8'`8b                                                         
@@ -69,19 +68,10 @@ async fn main() {
 
               - GitHub: https://github.com/Riktastic/Axium
               - Version: 1.0
-=======
-    Axum-API-Quickstart 
-    - An example API built with Rust, Axum, SQLx, and PostgreSQL
-    - GitHub: https://github.com/Riktastic/Axum-API-Quickstart/
->>>>>>> 830dbdb2074fc62e056ef70d374bea3f26ac0589
     "#);
 
     println!("🦖  Starting Axium...");
 
-<<<<<<< HEAD
-=======
-    // Retrieve server IP and port from the environment, default to 127.0.0.1:3000
->>>>>>> 830dbdb2074fc62e056ef70d374bea3f26ac0589
     let ip: IpAddr = config::get_env_with_default("SERVER_IP", "127.0.0.1")
         .parse()
         .expect("❌  Invalid IP address format.");