diff --git a/Makefile b/Makefile
index 3a77020..05cff59 100644
--- a/Makefile
+++ b/Makefile
@@ -63,4 +63,8 @@ make-storage-link:
 node-frontend-deps:
 	docker-compose exec php-fpm npm i --legacy-peer-deps
 
+<<<<<<< HEAD
 init: clone copy-infra-env compose-down compose-up setup-laravel-packages copy-laravel-env setup-laravel-key run-migrations node-frontend-deps build-frontend-prod fix-permissions make-storage-link
+=======
+init: clone compose-down compose-up setup-laravel-packages copy-laravel-env setup-laravel-key run-migrations node-frontend-deps start-frontend-prod fix-permissions make-storage-link
+>>>>>>> alex_chevski-main