fix merge

Author: ethanwee1

.github/scripts/build_triton_wheel.py

@@ -101,17 +101,12 @@ def build_triton(
 
         triton_repo = "https://github.com/openai/triton"
         if device == "rocm":
-<<<<<<< HEAD
             triton_repo = "https://github.com/ROCm/triton"
             rocm_version = get_rocm_version()  # e.g., "7.0.1"
             if tuple(map(int, rocm_version.split("."))) > (7, 0, 0):
                 triton_pkg_name = "triton"
             else:
                 triton_pkg_name = "pytorch-triton-rocm"
-=======
-            triton_pkg_name = "pytorch-triton-rocm"
-            triton_repo = "https://github.com/ROCm/triton"
->>>>>>> Use ROCm/triton and update triton.txt
         elif device == "xpu":
             triton_pkg_name = "pytorch-triton-xpu"
             triton_repo = "https://github.com/intel/intel-xpu-backend-for-triton"