Solving merge conflicts

app.py

@@ -1,25 +1,25 @@
-import click
-import uvicorn
-from dotenv import load_dotenv
-
-load_dotenv()
-
-
-@click.command()
-@click.option(
-    "--env",
-    type=click.Choice(["local", "staging", "production"], case_sensitive=False),
-    default="staging",
-)
-def main(env: str):
-    uvicorn.run(
-        app="app.server:app",
-        host="localhost",
-        port=8000,
-        reload=True if env != "production" else False,
-        workers=1,
-    )
-
-
-if __name__ == "__main__":
-    main()
+import click
+import uvicorn
+from dotenv import load_dotenv
+
+load_dotenv()
+
+
+@click.command()
+@click.option(
+    "--env",
+    type=click.Choice(["local", "staging", "production"], case_sensitive=False),
+    default="staging",
+)
+def main(env: str):
+    uvicorn.run(
+        app="app.server:app",
+        host="localhost",
+        port=8000,
+        reload=True if env != "production" else False,
+        workers=1,
+    )
+
+
+if __name__ == "__main__":
+    main()