fix merge conflicts

Author: mcr229

.ci/scripts/test_llama.sh

@@ -48,7 +48,12 @@ MODE=${MODE:-"xnnpack+custom"}
 # Default UPLOAD_DIR to empty string if not set
 UPLOAD_DIR="${UPLOAD_DIR:-}"
 
+# Default CMAKE_BUILD_TYPE to release mode
 CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE:-Release}
+
+# Default PT2E_QUANTIZE to empty string if not set
+PT2E_QUANTIZE="${PT2E_QUANTIZE:-}"
+
 if [[ $# -lt 4 ]]; then # Assuming 4 mandatory args
     echo "Expecting atleast 4 positional arguments"
     echo "Usage: [...]"