Fix merge conflict

Author: uditagarwal97

sycl/source/detail/context_impl.hpp

@@ -94,7 +94,7 @@ class context_impl : public std::enable_shared_from_this<context_impl> {
   const async_handler &get_async_handler() const;
 
   /// \return the Adapter associated with the platform of this context.
-  adapter_impl &getAdapter() const { return *MPlatform->getAdapter(); }
+  adapter_impl &getAdapter() const { return MPlatform->getAdapter(); }
 
   /// \return the PlatformImpl associated with this context.
   platform_impl &getPlatformImpl() const { return *MPlatform; }