diff --git a/userspace/SWUTS.h b/userspace/SWUTS.h
index 45a3407ad..407059465 100644
--- a/userspace/SWUTS.h
+++ b/userspace/SWUTS.h
@@ -139,6 +139,7 @@
  *   - @ref SWUTS-gr-obj-ctx
  *   - @ref SWUTS-gr-config
  *   - @ref SWUTS-ecc
+ *   - @ref SWUTS-channel_devctl_qnx
  *
  */
 
diff --git a/userspace/SWUTS.sources b/userspace/SWUTS.sources
index caead8e26..d13ccb45a 100644
--- a/userspace/SWUTS.sources
+++ b/userspace/SWUTS.sources
@@ -1,9 +1,6 @@
 INPUT += ../../../userspace/SWUTS.h
-<<<<<<< d9538d12c25f23f90bfb5978be79cdc4ff69f114
 INPUT += ../../../userspace/units/ce/nvgpu-ce.h
 INPUT += ../../../userspace/units/cg/nvgpu-cg.h
-=======
->>>>>>> gpu: nvgpu: unit: improve coverage for engines
 INPUT += ../../../userspace/units/enabled/nvgpu-enabled.h
 INPUT += ../../../userspace/units/interface/bit-utils/bit-utils.h
 INPUT += ../../../userspace/units/interface/bsearch/bsearch.h