diff --git a/ggml-sycl.h b/ggml-sycl.h
index 14384cd7f..b6cfc4fd9 100644
--- a/ggml-sycl.h
+++ b/ggml-sycl.h
@@ -29,13 +29,9 @@ GGML_API GGML_CALL int   ggml_backend_sycl_get_device_count();
 GGML_API GGML_CALL ggml_backend_buffer_type_t ggml_backend_sycl_split_buffer_type(const float * tensor_split);
 GGML_API GGML_CALL void ggml_backend_sycl_get_device_memory(int device, size_t *free, size_t *total);
 GGML_API GGML_CALL int ggml_backend_sycl_get_device_index(int device_id);
-<<<<<<< HEAD
 GGML_API GGML_CALL int ggml_backend_sycl_get_device_id(int device_index);
 GGML_API GGML_CALL void ggml_backend_sycl_set_single_device_mode(int main_gpu_id);
 GGML_API GGML_CALL void ggml_backend_sycl_set_mul_device_mode();
-=======
-
->>>>>>> 89fb735 (Revert "[SYCL] fix error when set main gpu to non-zero (#5901)" (#5918))
 #ifdef  __cplusplus
 }
 #endif