diff --git a/setup_venv.ps1 b/setup_venv.ps1
index b6a6994449..40f26ecf08 100644
--- a/setup_venv.ps1
+++ b/setup_venv.ps1
@@ -91,5 +91,4 @@ pip install wheel
 pip install --pre -r requirements.txt
 pip install -e .
 
->>>>>>> 0c904eb7 (Shark Studio SDXL support, HIP driver support, simpler device info, small fixes)
 Write-Host "Source your venv with ./shark.venv/Scripts/activate"