fix: resolve remaining conflict in models.mk after rebase

Author: Liav Weiss

tools/make/models.mk

@@ -175,9 +175,6 @@ download-models-full: ## Download all models used in local development and docs
 download-models-lora:
 download-models-lora: ## Download LoRA adapters and advanced embedding models only
 	@mkdir -p models
-<<<<<<< HEAD
-	PYTHONPATH=src python -m model_manager --config config/model_manager/models.lora.yaml
-=======
 	@echo "Downloading LoRA adapters and advanced embedding models..."
 	@if [ ! -f "models/lora_intent_classifier_bert-base-uncased_model/.downloaded" ] || [ ! -d "models/lora_intent_classifier_bert-base-uncased_model" ]; then \
 		hf download LLM-Semantic-Router/lora_intent_classifier_bert-base-uncased_model --local-dir models/lora_intent_classifier_bert-base-uncased_model && printf '%s\n' "$$(date -u +%Y-%m-%dT%H:%M:%SZ)" > models/lora_intent_classifier_bert-base-uncased_model/.downloaded; \
@@ -202,7 +199,6 @@ download-models-lora: ## Download LoRA adapters and advanced embedding models on
 			}; \
 		fi; \
 	fi
->>>>>>> fee395f (feat: re-enable EmbeddingGemma-300m support)
 
 # Clean up minimal models to save disk space (for CI)
 clean-minimal-models: ## Remove minimal models to save disk space