diff --git a/studio/setup.sh b/studio/setup.sh
index cf9c89163a..d64aff0583 100755
--- a/studio/setup.sh
+++ b/studio/setup.sh
@@ -502,7 +502,6 @@ fi
 #         fi
 #     fi
 # }
->>>>>>> 0f9e2ccd (chore: comment out llama.cpp build in setup.sh)
 
 echo ""
 if [ "$IS_COLAB" = true ]; then