diff --git a/configure b/configure
index cdaca6ccb81751f46bc8a2e0d879ce10426a6aab..29474677fd8291e1521bd90ee5887a112929ccfe 100755
--- a/configure
+++ b/configure
@@ -123,7 +123,6 @@ with_petsc
 with_eigen
 with_vcdevel
 enable_gpu
-enable_hip
 enable_asan
 enable_garbageinj
 enable_garbageinjv
@@ -249,8 +248,6 @@ do
     test_performance)
        conf_options="$conf_options -DTEST_PERFORMANCE=ON"
        ;;
-<<<<<<< HEAD
-=======
     gpu)
         if [ x"$CXX" == x"" ]; then
                 conf_options="$conf_options"
@@ -264,10 +261,6 @@ do
         fi
        conf_options="$conf_options -DENABLE_GPU=ON"
        ;;
-    hip)
-       conf_options="$conf_options -DHIP_ENABLE=ON"
-       ;;
->>>>>>> 49900f22654dff41bd2698a2a1f37ba6b2d05c49
     asan)
        conf_options="$conf_options -DENABLE_ASAN=ON"
        ;;
@@ -484,18 +477,6 @@ do
     case $ac_useropt in
       cuda_on_backend)
       conf_options="$conf_options -DCUDA_ON_BACKEND=$ac_optarg"
-      if [ x"$ac_optarg" == x"CUDA" ]; then
-        if [ x"$CXX" == x"" ]; then
-                conf_options="$conf_options"
-        else
-                conf_options="$conf_options -DCMAKE_CUDA_HOST_COMPILER=$(which $CXX)"
-        fi
-        if [ x"$CXXCUDA" == x"" ]; then
-                conf_options="$conf_options"
-        else
-                conf_options="$conf_options -DCMAKE_CUDA_COMPILER=$(which $CXXCUDA)"
-        fi
-      fi
       ;;
       libhilbert)
       conf_options="$conf_options -DLIBHILBERT_ROOT=$ac_optarg"