diff --git a/Makefile b/Makefile
index 1fbd7403c..79a2f6582 100644
--- a/Makefile
+++ b/Makefile
@@ -53,8 +53,8 @@ setup_devcontainer:
 	poetry run langflow --path src/frontend/build
 
 frontend:
-	make install_frontend
-	make run_frontend
+	@-make install_frontend || (echo "An error occurred while installing frontend dependencies. Attempting to fix." && make install_frontendc)
+	@make run_frontend
 
 frontendc:
 	make install_frontendc
@@ -65,7 +65,13 @@ install_backend:
 
 backend:
 	make install_backend
-	poetry run uvicorn --factory src.backend.langflow.main:create_app --port 7860 --reload --log-level debug
+ifeq ($(login),1)
+	@echo "Running backend without autologin";
+	poetry run langflow run --backend-only --port 7860 --host 0.0.0.0 --no-open-browser
+else
+	@echo "Running backend with autologin";
+	LANGFLOW_AUTO_LOGIN=True poetry run langflow run --backend-only --port 7860 --host 0.0.0.0 --no-open-browser
+endif
 
 build_and_run:
 	echo 'Removing dist folder'
diff --git a/README.md b/README.md
index a9effbce6..d3421ecc6 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@
 </p>
 
 <a href="https://github.com/logspace-ai/langflow">
-    <img width="100%" src="https://github.com/logspace-ai/langflow/blob/main/img/langflow-demo.gif?raw=true"></a>
+    <img width="100%" src="https://github.com/logspace-ai/langflow/blob/dev/img/langflow-demo.gif?raw=true"></a>
 
 <p>
 </p>
diff --git a/img/langflow-demo.gif b/img/langflow-demo.gif
index 4cea58628..19b63eeb1 100644
Binary files a/img/langflow-demo.gif and b/img/langflow-demo.gif differ
diff --git a/src/backend/langflow/services/database/utils.py b/src/backend/langflow/services/database/utils.py
index 968cfef59..b457b70e2 100644
--- a/src/backend/langflow/services/database/utils.py
+++ b/src/backend/langflow/services/database/utils.py
@@ -32,7 +32,11 @@ def initialize_database():
     try:
         database_service.run_migrations()
     except CommandError as exc:
-        if "Can't locate revision identified by" not in str(exc):
+        # if "overlaps with other requested revisions" or "Can't locate revision identified by"
+        # are not in the exception, we can't handle it
+        if "overlaps with other requested revisions" not in str(
+            exc
+        ) and "Can't locate revision identified by" not in str(exc):
             raise exc
         # This means there's wrong revision in the DB
         # We need to delete the alembic_version table