diff --cc .github/scripts/build-rocm.sh
index cc15210,fc7515a..0000000
--- a/.github/scripts/build-rocm.sh
+++ b/.github/scripts/build-rocm.sh
@@@ -1,11 -1,10 +1,18 @@@
  #!/bin/bash
  declare build_arch
  declare build_os
++<<<<<<< HEAD
 +declare rocm_version
 +
 +set -xeuo pipefail
 +if [ "${build_os:0:6}" == ubuntu ]; then
 +	image=rocm/dev-ubuntu-22.04:${rocm_version}-complete
++=======
+ 
+ set -xeuo pipefail
+ if [ "${build_os:0:6}" == ubuntu ]; then
+ 	image=rocm/dev-ubuntu-22.04:6.1-complete
++>>>>>>> upstream/multi-backend-refactor
  	echo "Using image $image"
  	docker run --rm --platform "linux/$build_arch" -i \
  		-w /src -v "$PWD:/src" "$image" sh -c \
@@@ -15,6 -14,6 +22,12 @@@
        && cmake --build ."
  fi
  
++<<<<<<< HEAD
 +output_dir="output/${build_os}/${build_arch}"
 +mkdir -p "${output_dir}"
 +(shopt -s nullglob && cp bitsandbytes/*.{so,dylib,dll} "${output_dir}")
++=======
+ #output_dir="output/${build_os}/${build_arch}"
+ #mkdir -p "${output_dir}"
+ #(shopt -s nullglob && cp bitsandbytes/*.{so,dylib,dll} "${output_dir}")
++>>>>>>> upstream/multi-backend-refactor
diff --cc .github/workflows/python-package.yml
index f4cc548,671dfee..0000000
--- a/.github/workflows/python-package.yml
+++ b/.github/workflows/python-package.yml
@@@ -108,8 -106,6 +106,11 @@@ jobs
        matrix:
          os: [ubuntu-latest]
          arch: [x86_64]
++<<<<<<< HEAD
 +        rocm_version:
 +          ["6.1.2"]
++=======
++>>>>>>> upstream/multi-backend-refactor
      runs-on: ${{ matrix.os }} # One day, we could run them on native agents. Azure supports this now but it's planned only for Q3 2023 for hosted agents
      steps:
        - uses: actions/checkout@v4
@@@ -127,13 -123,6 +128,16 @@@
          env:
            build_os: ${{ matrix.os }}
            build_arch: ${{ matrix.arch }}
++<<<<<<< HEAD
 +          rocm_version: ${{ matrix.rocm_version }}
 +      - name: Upload build artifact
 +        uses: actions/upload-artifact@v4
 +        with:
 +          name: shared_library_rocm_${{ matrix.os }}_${{ matrix.arch }}_${{ matrix.rocm_version }}
 +          path: output/*
 +          retention-days: 7
++=======
++>>>>>>> upstream/multi-backend-refactor
    build-wheels:
      needs:
        - build-shared-libs