rebase and resolve conflicts

Author: vtavana

dpnp/backend/extensions/vm/types_matrix.hpp

@@ -81,14 +81,15 @@ struct CeilOutputType
         dpctl_td_ns::TypeMapResultEntry<T, double, double>,
         dpctl_td_ns::TypeMapResultEntry<T, float, float>,
         dpctl_td_ns::DefaultResultEntry<void>>::result_type;
-}
+};
 
 /**
  * @brief A factory to define pairs of supported types for which
  * MKL VM library provides support in oneapi::mkl::vm::conj<T> function.
  *
  * @tparam T Type of input vector `a` and of result vector `y`.
  */
+template <typename T>
 struct ConjOutputType
 {
     using value_type = typename std::disjunction<