From 5e14625be7bb60c65aa2ac13ceccd9c689a881ab Mon Sep 17 00:00:00 2001
From: Kevin Abraham <kevin.abraham@amd.com>
Date: Mon, 27 Oct 2025 20:36:26 +0000
Subject: [PATCH] resolved merge issues with 
 test_ck_factory_grouped_convolution_forward_convscale

---
 ...k_factory_grouped_convolution_forward_convscale.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/experimental/builder/test/test_ck_factory_grouped_convolution_forward_convscale.cpp b/experimental/builder/test/test_ck_factory_grouped_convolution_forward_convscale.cpp
index 51a901d7ed..f6339ce5b7 100644
--- a/experimental/builder/test/test_ck_factory_grouped_convolution_forward_convscale.cpp
+++ b/experimental/builder/test/test_ck_factory_grouped_convolution_forward_convscale.cpp
@@ -209,8 +209,14 @@ struct F8_ConvScaleAdd
 
 struct F8_ConvInvscale
 {
-    using DeviceOp = ::DeviceOp<ck::Tuple<>, ck::Tuple<>, ck::f8_t, ConvInvscale>;
-
+    using DeviceOp = ::DeviceOp<ck::Tuple<>,
+                                ck::Tuple<>,
+                                ck::f8_t,
+                                ck::f8_t,
+                                ck::f8_t,
+                                ConvInvscale,
+                                ck::f8_t,
+                                ck::f8_t>;
     constexpr static auto expected = {
         // clang-format off
         ""