fix: resolve merge conflicts in Makefile

Author: balasiddarthan22

makefiles/Makefile

@@ -85,12 +85,8 @@ validate-dev-env:
 	fi
 
 ensure-admin-key:
-<<<<<<< Updated upstream
-	@admin_key="$$(grep '^CONVEX_SELF_HOSTED_ADMIN_KEY=' .env | cut -d= -f2- | tr -d '\r')"; \
-=======
 	@env_value() { grep "^$$1=" .env | tail -n1 | cut -d= -f2- | tr -d '\r'; }; \
 	admin_key="$$(env_value CONVEX_SELF_HOSTED_ADMIN_KEY)"; \
->>>>>>> Stashed changes
 	needs_gen=false; \
 	if [[ -z "$$admin_key" ]]; then \
 		needs_gen=true; \
@@ -121,14 +117,9 @@ ensure-admin-key:
 
 convex-env:
 	@test -f .env || { echo "Error: .env not found. Run: cp .env.example .env"; exit 1; }
-<<<<<<< Updated upstream
-	@issuer="$$(grep '^CLERK_JWT_ISSUER_DOMAIN=' .env | cut -d= -f2- | tr -d '\r')"; \
-		admin_key="$$(grep '^CONVEX_SELF_HOSTED_ADMIN_KEY=' .env | cut -d= -f2- | tr -d '\r')"; \
-=======
 	@env_value() { grep "^$$1=" .env | tail -n1 | cut -d= -f2- | tr -d '\r'; }; \
 		issuer="$$(env_value CLERK_JWT_ISSUER_DOMAIN)"; \
 		admin_key="$$(env_value CONVEX_SELF_HOSTED_ADMIN_KEY)"; \
->>>>>>> Stashed changes
 		if [[ -z "$$issuer" || "$$issuer" == "https://your-app.clerk.accounts.dev" ]]; then \
 			echo "Error: CLERK_JWT_ISSUER_DOMAIN must be your Clerk issuer URL in root .env"; \
 			exit 1; \
@@ -144,12 +135,8 @@ convex-env:
 
 convex-push:
 	@test -f .env || { echo "Error: .env not found. Run: cp .env.example .env"; exit 1; }
-<<<<<<< Updated upstream
-	@admin_key="$$(grep '^CONVEX_SELF_HOSTED_ADMIN_KEY=' .env | cut -d= -f2- | tr -d '\r')"; \
-=======
 	@env_value() { grep "^$$1=" .env | tail -n1 | cut -d= -f2- | tr -d '\r'; }; \
 		admin_key="$$(env_value CONVEX_SELF_HOSTED_ADMIN_KEY)"; \
->>>>>>> Stashed changes
 		if [[ -z "$$admin_key" ]]; then \
 			echo "Error: CONVEX_SELF_HOSTED_ADMIN_KEY is missing in root .env"; \
 			echo "Run make dev to generate it automatically."; \