diff --git a/third_party/vulkan/vulkan.hpp b/third_party/vulkan/vulkan.hpp
index 9c2d4b1..c05ead1 100644
--- a/third_party/vulkan/vulkan.hpp
+++ b/third_party/vulkan/vulkan.hpp
@@ -57,11 +57,7 @@ extern "C" __declspec( dllimport ) FARPROC __stdcall GetProcAddress( HINSTANCE h
 #  endif
 #endif
 
-<<<<<<< HEAD
 VULKAN_HPP_STATIC_ASSERT( VK_HEADER_VERSION == 337, "Wrong VK_HEADER_VERSION!" );
-=======
-VULKAN_HPP_STATIC_ASSERT( VK_HEADER_VERSION == 335, "Wrong VK_HEADER_VERSION!" );
->>>>>>> master
 
 // <tuple> includes <sys/sysmacros.h> through some other header
 // this results in major(x) being resolved to gnu_dev_major(x)
@@ -8559,10 +8555,6 @@ namespace VULKAN_HPP_NAMESPACE
   VULKAN_HPP_CONSTEXPR_INLINE auto EXTPresentTimingSpecVersion   = VK_EXT_PRESENT_TIMING_SPEC_VERSION;
   VULKAN_HPP_CONSTEXPR_INLINE auto EXTPresentTimingExtensionName = VK_EXT_PRESENT_TIMING_EXTENSION_NAME;
 
-  //=== VK_EXT_present_timing ===
-  VULKAN_HPP_CONSTEXPR_INLINE auto EXTPresentTimingExtensionName = VK_EXT_PRESENT_TIMING_EXTENSION_NAME;
-  VULKAN_HPP_CONSTEXPR_INLINE auto EXTPresentTimingSpecVersion   = VK_EXT_PRESENT_TIMING_SPEC_VERSION;
-
   //=== VK_INTEL_shader_integer_functions2 ===
   VULKAN_HPP_CONSTEXPR_INLINE auto INTELShaderIntegerFunctions2SpecVersion   = VK_INTEL_SHADER_INTEGER_FUNCTIONS_2_SPEC_VERSION;
   VULKAN_HPP_CONSTEXPR_INLINE auto INTELShaderIntegerFunctions2ExtensionName = VK_INTEL_SHADER_INTEGER_FUNCTIONS_2_EXTENSION_NAME;
diff --git a/third_party/vulkan/vulkan_core.h b/third_party/vulkan/vulkan_core.h
index 6bfd928..d176035 100644
--- a/third_party/vulkan/vulkan_core.h
+++ b/third_party/vulkan/vulkan_core.h
@@ -66,11 +66,7 @@ extern "C" {
 //#define VK_API_VERSION VK_MAKE_API_VERSION(0, 1, 0, 0) // Patch version should always be set to 0
 
 // Version of this file
-<<<<<<< HEAD
 #define VK_HEADER_VERSION 337
-=======
-#define VK_HEADER_VERSION 335
->>>>>>> master
 
 // Complete version of this file
 #define VK_HEADER_VERSION_COMPLETE VK_MAKE_API_VERSION(0, 1, 4, VK_HEADER_VERSION)
@@ -16866,10 +16862,6 @@ VKAPI_ATTR void VKAPI_CALL vkGetQueueCheckpointData2NV(
 #define VK_EXT_present_timing 1
 #define VK_EXT_PRESENT_TIMING_SPEC_VERSION 3
 #define VK_EXT_PRESENT_TIMING_EXTENSION_NAME "VK_EXT_present_timing"
-<<<<<<< HEAD
-=======
-typedef VkFlags VkPresentStageFlagsEXT;
->>>>>>> master
 
 typedef enum VkPresentStageFlagBitsEXT {
     VK_PRESENT_STAGE_QUEUE_OPERATIONS_END_BIT_EXT = 0x00000001,
@@ -16878,32 +16870,21 @@ typedef enum VkPresentStageFlagBitsEXT {
     VK_PRESENT_STAGE_IMAGE_FIRST_PIXEL_VISIBLE_BIT_EXT = 0x00000008,
     VK_PRESENT_STAGE_FLAG_BITS_MAX_ENUM_EXT = 0x7FFFFFFF
 } VkPresentStageFlagBitsEXT;
-<<<<<<< HEAD
 typedef VkFlags VkPresentStageFlagsEXT;
-=======
-typedef VkFlags VkPastPresentationTimingFlagsEXT;
->>>>>>> master
 
 typedef enum VkPastPresentationTimingFlagBitsEXT {
     VK_PAST_PRESENTATION_TIMING_ALLOW_PARTIAL_RESULTS_BIT_EXT = 0x00000001,
     VK_PAST_PRESENTATION_TIMING_ALLOW_OUT_OF_ORDER_RESULTS_BIT_EXT = 0x00000002,
     VK_PAST_PRESENTATION_TIMING_FLAG_BITS_MAX_ENUM_EXT = 0x7FFFFFFF
 } VkPastPresentationTimingFlagBitsEXT;
-<<<<<<< HEAD
 typedef VkFlags VkPastPresentationTimingFlagsEXT;
-=======
-typedef VkFlags VkPresentTimingInfoFlagsEXT;
->>>>>>> master
 
 typedef enum VkPresentTimingInfoFlagBitsEXT {
     VK_PRESENT_TIMING_INFO_PRESENT_AT_RELATIVE_TIME_BIT_EXT = 0x00000001,
     VK_PRESENT_TIMING_INFO_PRESENT_AT_NEAREST_REFRESH_CYCLE_BIT_EXT = 0x00000002,
     VK_PRESENT_TIMING_INFO_FLAG_BITS_MAX_ENUM_EXT = 0x7FFFFFFF
 } VkPresentTimingInfoFlagBitsEXT;
-<<<<<<< HEAD
 typedef VkFlags VkPresentTimingInfoFlagsEXT;
-=======
->>>>>>> master
 typedef struct VkPhysicalDevicePresentTimingFeaturesEXT {
     VkStructureType    sType;
     void*              pNext;
diff --git a/third_party/vulkan/vulkan_structs.hpp b/third_party/vulkan/vulkan_structs.hpp
index 14baa4c..1a7d5b2 100644
--- a/third_party/vulkan/vulkan_structs.hpp
+++ b/third_party/vulkan/vulkan_structs.hpp
@@ -88738,17 +88738,12 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-<<<<<<< HEAD
     VULKAN_HPP_CONSTEXPR_14 PresentStageTimeEXT & setStage( PresentStageFlagsEXT stage_ ) & VULKAN_HPP_NOEXCEPT
-=======
-    VULKAN_HPP_CONSTEXPR_14 PresentStageTimeEXT & setStage( PresentStageFlagsEXT stage_ ) VULKAN_HPP_NOEXCEPT
->>>>>>> master
     {
       stage = stage_;
       return *this;
     }
 
-<<<<<<< HEAD
     VULKAN_HPP_CONSTEXPR_14 PresentStageTimeEXT && setStage( PresentStageFlagsEXT stage_ ) && VULKAN_HPP_NOEXCEPT
     {
       stage = stage_;
@@ -88756,22 +88751,16 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PresentStageTimeEXT & setTime( uint64_t time_ ) & VULKAN_HPP_NOEXCEPT
-=======
-    VULKAN_HPP_CONSTEXPR_14 PresentStageTimeEXT & setTime( uint64_t time_ ) VULKAN_HPP_NOEXCEPT
->>>>>>> master
     {
       time = time_;
       return *this;
     }
-<<<<<<< HEAD
 
     VULKAN_HPP_CONSTEXPR_14 PresentStageTimeEXT && setTime( uint64_t time_ ) && VULKAN_HPP_NOEXCEPT
     {
       time = time_;
       return std::move( *this );
     }
-=======
->>>>>>> master
 #endif /*VULKAN_HPP_NO_SETTERS*/
 
     operator VkPresentStageTimeEXT const &() const VULKAN_HPP_NOEXCEPT
@@ -88897,17 +88886,12 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-<<<<<<< HEAD
     VULKAN_HPP_CONSTEXPR_14 PastPresentationTimingEXT & setPNext( void * pNext_ ) & VULKAN_HPP_NOEXCEPT
-=======
-    VULKAN_HPP_CONSTEXPR_14 PastPresentationTimingEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
->>>>>>> master
     {
       pNext = pNext_;
       return *this;
     }
 
-<<<<<<< HEAD
     VULKAN_HPP_CONSTEXPR_14 PastPresentationTimingEXT && setPNext( void * pNext_ ) && VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -88915,15 +88899,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PastPresentationTimingEXT & setPresentId( uint64_t presentId_ ) & VULKAN_HPP_NOEXCEPT
-=======
-    VULKAN_HPP_CONSTEXPR_14 PastPresentationTimingEXT & setPresentId( uint64_t presentId_ ) VULKAN_HPP_NOEXCEPT
->>>>>>> master
     {
       presentId = presentId_;
       return *this;
     }
 
-<<<<<<< HEAD
     VULKAN_HPP_CONSTEXPR_14 PastPresentationTimingEXT && setPresentId( uint64_t presentId_ ) && VULKAN_HPP_NOEXCEPT
     {
       presentId = presentId_;
@@ -88931,15 +88911,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PastPresentationTimingEXT & setTargetTime( uint64_t targetTime_ ) & VULKAN_HPP_NOEXCEPT
-=======
-    VULKAN_HPP_CONSTEXPR_14 PastPresentationTimingEXT & setTargetTime( uint64_t targetTime_ ) VULKAN_HPP_NOEXCEPT
->>>>>>> master
     {
       targetTime = targetTime_;
       return *this;
     }
 
-<<<<<<< HEAD
     VULKAN_HPP_CONSTEXPR_14 PastPresentationTimingEXT && setTargetTime( uint64_t targetTime_ ) && VULKAN_HPP_NOEXCEPT
     {
       targetTime = targetTime_;
@@ -88947,15 +88923,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PastPresentationTimingEXT & setPresentStageCount( uint32_t presentStageCount_ ) & VULKAN_HPP_NOEXCEPT
-=======
-    VULKAN_HPP_CONSTEXPR_14 PastPresentationTimingEXT & setPresentStageCount( uint32_t presentStageCount_ ) VULKAN_HPP_NOEXCEPT
->>>>>>> master
     {
       presentStageCount = presentStageCount_;
       return *this;
     }
 
-<<<<<<< HEAD
     VULKAN_HPP_CONSTEXPR_14 PastPresentationTimingEXT && setPresentStageCount( uint32_t presentStageCount_ ) && VULKAN_HPP_NOEXCEPT
     {
       presentStageCount = presentStageCount_;
@@ -88963,23 +88935,17 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PastPresentationTimingEXT & setPPresentStages( PresentStageTimeEXT * pPresentStages_ ) & VULKAN_HPP_NOEXCEPT
-=======
-    VULKAN_HPP_CONSTEXPR_14 PastPresentationTimingEXT & setPPresentStages( PresentStageTimeEXT * pPresentStages_ ) VULKAN_HPP_NOEXCEPT
->>>>>>> master
     {
       pPresentStages = pPresentStages_;
       return *this;
     }
 
-<<<<<<< HEAD
     VULKAN_HPP_CONSTEXPR_14 PastPresentationTimingEXT && setPPresentStages( PresentStageTimeEXT * pPresentStages_ ) && VULKAN_HPP_NOEXCEPT
     {
       pPresentStages = pPresentStages_;
       return std::move( *this );
     }
 
-=======
->>>>>>> master
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
     PastPresentationTimingEXT & setPresentStages( ArrayProxyNoTemporaries<PresentStageTimeEXT> const & presentStages_ ) VULKAN_HPP_NOEXCEPT
     {
@@ -88989,17 +88955,12 @@ namespace VULKAN_HPP_NAMESPACE
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
-<<<<<<< HEAD
     VULKAN_HPP_CONSTEXPR_14 PastPresentationTimingEXT & setTimeDomain( TimeDomainKHR timeDomain_ ) & VULKAN_HPP_NOEXCEPT
-=======
-    VULKAN_HPP_CONSTEXPR_14 PastPresentationTimingEXT & setTimeDomain( TimeDomainKHR timeDomain_ ) VULKAN_HPP_NOEXCEPT
->>>>>>> master
     {
       timeDomain = timeDomain_;
       return *this;
     }
 
-<<<<<<< HEAD
     VULKAN_HPP_CONSTEXPR_14 PastPresentationTimingEXT && setTimeDomain( TimeDomainKHR timeDomain_ ) && VULKAN_HPP_NOEXCEPT
     {
       timeDomain = timeDomain_;
@@ -89007,15 +88968,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PastPresentationTimingEXT & setTimeDomainId( uint64_t timeDomainId_ ) & VULKAN_HPP_NOEXCEPT
-=======
-    VULKAN_HPP_CONSTEXPR_14 PastPresentationTimingEXT & setTimeDomainId( uint64_t timeDomainId_ ) VULKAN_HPP_NOEXCEPT
->>>>>>> master
     {
       timeDomainId = timeDomainId_;
       return *this;
     }
 
-<<<<<<< HEAD
     VULKAN_HPP_CONSTEXPR_14 PastPresentationTimingEXT && setTimeDomainId( uint64_t timeDomainId_ ) && VULKAN_HPP_NOEXCEPT
     {
       timeDomainId = timeDomainId_;
@@ -89023,22 +88980,16 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PastPresentationTimingEXT & setReportComplete( Bool32 reportComplete_ ) & VULKAN_HPP_NOEXCEPT
-=======
-    VULKAN_HPP_CONSTEXPR_14 PastPresentationTimingEXT & setReportComplete( Bool32 reportComplete_ ) VULKAN_HPP_NOEXCEPT
->>>>>>> master
     {
       reportComplete = reportComplete_;
       return *this;
     }
-<<<<<<< HEAD
 
     VULKAN_HPP_CONSTEXPR_14 PastPresentationTimingEXT && setReportComplete( Bool32 reportComplete_ ) && VULKAN_HPP_NOEXCEPT
     {
       reportComplete = reportComplete_;
       return std::move( *this );
     }
-=======
->>>>>>> master
 #endif /*VULKAN_HPP_NO_SETTERS*/
 
     operator VkPastPresentationTimingEXT const &() const VULKAN_HPP_NOEXCEPT
@@ -89256,17 +89207,12 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-<<<<<<< HEAD
     VULKAN_HPP_CONSTEXPR_14 PastPresentationTimingInfoEXT & setPNext( const void * pNext_ ) & VULKAN_HPP_NOEXCEPT
-=======
-    VULKAN_HPP_CONSTEXPR_14 PastPresentationTimingInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
->>>>>>> master
     {
       pNext = pNext_;
       return *this;
     }
 
-<<<<<<< HEAD
     VULKAN_HPP_CONSTEXPR_14 PastPresentationTimingInfoEXT && setPNext( const void * pNext_ ) && VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -89274,15 +89220,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PastPresentationTimingInfoEXT & setFlags( PastPresentationTimingFlagsEXT flags_ ) & VULKAN_HPP_NOEXCEPT
-=======
-    VULKAN_HPP_CONSTEXPR_14 PastPresentationTimingInfoEXT & setFlags( PastPresentationTimingFlagsEXT flags_ ) VULKAN_HPP_NOEXCEPT
->>>>>>> master
     {
       flags = flags_;
       return *this;
     }
 
-<<<<<<< HEAD
     VULKAN_HPP_CONSTEXPR_14 PastPresentationTimingInfoEXT && setFlags( PastPresentationTimingFlagsEXT flags_ ) && VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
@@ -89290,22 +89232,16 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PastPresentationTimingInfoEXT & setSwapchain( SwapchainKHR swapchain_ ) & VULKAN_HPP_NOEXCEPT
-=======
-    VULKAN_HPP_CONSTEXPR_14 PastPresentationTimingInfoEXT & setSwapchain( SwapchainKHR swapchain_ ) VULKAN_HPP_NOEXCEPT
->>>>>>> master
     {
       swapchain = swapchain_;
       return *this;
     }
-<<<<<<< HEAD
 
     VULKAN_HPP_CONSTEXPR_14 PastPresentationTimingInfoEXT && setSwapchain( SwapchainKHR swapchain_ ) && VULKAN_HPP_NOEXCEPT
     {
       swapchain = swapchain_;
       return std::move( *this );
     }
-=======
->>>>>>> master
 #endif /*VULKAN_HPP_NO_SETTERS*/
 
     operator VkPastPresentationTimingInfoEXT const &() const VULKAN_HPP_NOEXCEPT
@@ -89428,17 +89364,12 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-<<<<<<< HEAD
     VULKAN_HPP_CONSTEXPR_14 PastPresentationTimingPropertiesEXT & setPNext( void * pNext_ ) & VULKAN_HPP_NOEXCEPT
-=======
-    VULKAN_HPP_CONSTEXPR_14 PastPresentationTimingPropertiesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
->>>>>>> master
     {
       pNext = pNext_;
       return *this;
     }
 
-<<<<<<< HEAD
     VULKAN_HPP_CONSTEXPR_14 PastPresentationTimingPropertiesEXT && setPNext( void * pNext_ ) && VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -89446,15 +89377,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PastPresentationTimingPropertiesEXT & setTimingPropertiesCounter( uint64_t timingPropertiesCounter_ ) & VULKAN_HPP_NOEXCEPT
-=======
-    VULKAN_HPP_CONSTEXPR_14 PastPresentationTimingPropertiesEXT & setTimingPropertiesCounter( uint64_t timingPropertiesCounter_ ) VULKAN_HPP_NOEXCEPT
->>>>>>> master
     {
       timingPropertiesCounter = timingPropertiesCounter_;
       return *this;
     }
 
-<<<<<<< HEAD
     VULKAN_HPP_CONSTEXPR_14 PastPresentationTimingPropertiesEXT && setTimingPropertiesCounter( uint64_t timingPropertiesCounter_ ) && VULKAN_HPP_NOEXCEPT
     {
       timingPropertiesCounter = timingPropertiesCounter_;
@@ -89462,15 +89389,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PastPresentationTimingPropertiesEXT & setTimeDomainsCounter( uint64_t timeDomainsCounter_ ) & VULKAN_HPP_NOEXCEPT
-=======
-    VULKAN_HPP_CONSTEXPR_14 PastPresentationTimingPropertiesEXT & setTimeDomainsCounter( uint64_t timeDomainsCounter_ ) VULKAN_HPP_NOEXCEPT
->>>>>>> master
     {
       timeDomainsCounter = timeDomainsCounter_;
       return *this;
     }
 
-<<<<<<< HEAD
     VULKAN_HPP_CONSTEXPR_14 PastPresentationTimingPropertiesEXT && setTimeDomainsCounter( uint64_t timeDomainsCounter_ ) && VULKAN_HPP_NOEXCEPT
     {
       timeDomainsCounter = timeDomainsCounter_;
@@ -89478,15 +89401,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PastPresentationTimingPropertiesEXT & setPresentationTimingCount( uint32_t presentationTimingCount_ ) & VULKAN_HPP_NOEXCEPT
-=======
-    VULKAN_HPP_CONSTEXPR_14 PastPresentationTimingPropertiesEXT & setPresentationTimingCount( uint32_t presentationTimingCount_ ) VULKAN_HPP_NOEXCEPT
->>>>>>> master
     {
       presentationTimingCount = presentationTimingCount_;
       return *this;
     }
 
-<<<<<<< HEAD
     VULKAN_HPP_CONSTEXPR_14 PastPresentationTimingPropertiesEXT && setPresentationTimingCount( uint32_t presentationTimingCount_ ) && VULKAN_HPP_NOEXCEPT
     {
       presentationTimingCount = presentationTimingCount_;
@@ -89495,16 +89414,11 @@ namespace VULKAN_HPP_NAMESPACE
 
     VULKAN_HPP_CONSTEXPR_14 PastPresentationTimingPropertiesEXT & setPPresentationTimings( PastPresentationTimingEXT * pPresentationTimings_ ) &
       VULKAN_HPP_NOEXCEPT
-=======
-    VULKAN_HPP_CONSTEXPR_14 PastPresentationTimingPropertiesEXT &
-      setPPresentationTimings( PastPresentationTimingEXT * pPresentationTimings_ ) VULKAN_HPP_NOEXCEPT
->>>>>>> master
     {
       pPresentationTimings = pPresentationTimings_;
       return *this;
     }
 
-<<<<<<< HEAD
     VULKAN_HPP_CONSTEXPR_14 PastPresentationTimingPropertiesEXT && setPPresentationTimings( PastPresentationTimingEXT * pPresentationTimings_ ) &&
       VULKAN_HPP_NOEXCEPT
     {
@@ -89512,8 +89426,6 @@ namespace VULKAN_HPP_NAMESPACE
       return std::move( *this );
     }
 
-=======
->>>>>>> master
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
     PastPresentationTimingPropertiesEXT &
       setPresentationTimings( ArrayProxyNoTemporaries<PastPresentationTimingEXT> const & presentationTimings_ ) VULKAN_HPP_NOEXCEPT
@@ -123986,17 +123898,12 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-<<<<<<< HEAD
     VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePresentTimingFeaturesEXT & setPNext( void * pNext_ ) & VULKAN_HPP_NOEXCEPT
-=======
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePresentTimingFeaturesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
->>>>>>> master
     {
       pNext = pNext_;
       return *this;
     }
 
-<<<<<<< HEAD
     VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePresentTimingFeaturesEXT && setPNext( void * pNext_ ) && VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -124004,15 +123911,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePresentTimingFeaturesEXT & setPresentTiming( Bool32 presentTiming_ ) & VULKAN_HPP_NOEXCEPT
-=======
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePresentTimingFeaturesEXT & setPresentTiming( Bool32 presentTiming_ ) VULKAN_HPP_NOEXCEPT
->>>>>>> master
     {
       presentTiming = presentTiming_;
       return *this;
     }
 
-<<<<<<< HEAD
     VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePresentTimingFeaturesEXT && setPresentTiming( Bool32 presentTiming_ ) && VULKAN_HPP_NOEXCEPT
     {
       presentTiming = presentTiming_;
@@ -124020,15 +123923,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePresentTimingFeaturesEXT & setPresentAtAbsoluteTime( Bool32 presentAtAbsoluteTime_ ) & VULKAN_HPP_NOEXCEPT
-=======
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePresentTimingFeaturesEXT & setPresentAtAbsoluteTime( Bool32 presentAtAbsoluteTime_ ) VULKAN_HPP_NOEXCEPT
->>>>>>> master
     {
       presentAtAbsoluteTime = presentAtAbsoluteTime_;
       return *this;
     }
 
-<<<<<<< HEAD
     VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePresentTimingFeaturesEXT && setPresentAtAbsoluteTime( Bool32 presentAtAbsoluteTime_ ) && VULKAN_HPP_NOEXCEPT
     {
       presentAtAbsoluteTime = presentAtAbsoluteTime_;
@@ -124036,22 +123935,16 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePresentTimingFeaturesEXT & setPresentAtRelativeTime( Bool32 presentAtRelativeTime_ ) & VULKAN_HPP_NOEXCEPT
-=======
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePresentTimingFeaturesEXT & setPresentAtRelativeTime( Bool32 presentAtRelativeTime_ ) VULKAN_HPP_NOEXCEPT
->>>>>>> master
     {
       presentAtRelativeTime = presentAtRelativeTime_;
       return *this;
     }
-<<<<<<< HEAD
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDevicePresentTimingFeaturesEXT && setPresentAtRelativeTime( Bool32 presentAtRelativeTime_ ) && VULKAN_HPP_NOEXCEPT
     {
       presentAtRelativeTime = presentAtRelativeTime_;
       return std::move( *this );
     }
-=======
->>>>>>> master
 #endif /*VULKAN_HPP_NO_SETTERS*/
 
     operator VkPhysicalDevicePresentTimingFeaturesEXT const &() const VULKAN_HPP_NOEXCEPT
@@ -126234,17 +126127,12 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-<<<<<<< HEAD
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceRayTracingInvocationReorderFeaturesNV & setPNext( void * pNext_ ) & VULKAN_HPP_NOEXCEPT
-=======
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceRayTracingInvocationReorderFeaturesNV & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
->>>>>>> master
     {
       pNext = pNext_;
       return *this;
     }
 
-<<<<<<< HEAD
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceRayTracingInvocationReorderFeaturesNV && setPNext( void * pNext_ ) && VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -126253,15 +126141,10 @@ namespace VULKAN_HPP_NAMESPACE
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceRayTracingInvocationReorderFeaturesNV & setRayTracingInvocationReorder( Bool32 rayTracingInvocationReorder_ ) &
       VULKAN_HPP_NOEXCEPT
-=======
-    VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceRayTracingInvocationReorderFeaturesNV &
-      setRayTracingInvocationReorder( Bool32 rayTracingInvocationReorder_ ) VULKAN_HPP_NOEXCEPT
->>>>>>> master
     {
       rayTracingInvocationReorder = rayTracingInvocationReorder_;
       return *this;
     }
-<<<<<<< HEAD
 
     VULKAN_HPP_CONSTEXPR_14 PhysicalDeviceRayTracingInvocationReorderFeaturesNV && setRayTracingInvocationReorder( Bool32 rayTracingInvocationReorder_ ) &&
       VULKAN_HPP_NOEXCEPT
@@ -126269,8 +126152,6 @@ namespace VULKAN_HPP_NAMESPACE
       rayTracingInvocationReorder = rayTracingInvocationReorder_;
       return std::move( *this );
     }
-=======
->>>>>>> master
 #endif /*VULKAN_HPP_NO_SETTERS*/
 
     operator VkPhysicalDeviceRayTracingInvocationReorderFeaturesNV const &() const VULKAN_HPP_NOEXCEPT
@@ -156820,17 +156701,12 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-<<<<<<< HEAD
     VULKAN_HPP_CONSTEXPR_14 PresentTimingInfoEXT & setPNext( const void * pNext_ ) & VULKAN_HPP_NOEXCEPT
-=======
-    VULKAN_HPP_CONSTEXPR_14 PresentTimingInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
->>>>>>> master
     {
       pNext = pNext_;
       return *this;
     }
 
-<<<<<<< HEAD
     VULKAN_HPP_CONSTEXPR_14 PresentTimingInfoEXT && setPNext( const void * pNext_ ) && VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -156838,15 +156714,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PresentTimingInfoEXT & setFlags( PresentTimingInfoFlagsEXT flags_ ) & VULKAN_HPP_NOEXCEPT
-=======
-    VULKAN_HPP_CONSTEXPR_14 PresentTimingInfoEXT & setFlags( PresentTimingInfoFlagsEXT flags_ ) VULKAN_HPP_NOEXCEPT
->>>>>>> master
     {
       flags = flags_;
       return *this;
     }
 
-<<<<<<< HEAD
     VULKAN_HPP_CONSTEXPR_14 PresentTimingInfoEXT && setFlags( PresentTimingInfoFlagsEXT flags_ ) && VULKAN_HPP_NOEXCEPT
     {
       flags = flags_;
@@ -156854,15 +156726,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PresentTimingInfoEXT & setTargetTime( uint64_t targetTime_ ) & VULKAN_HPP_NOEXCEPT
-=======
-    VULKAN_HPP_CONSTEXPR_14 PresentTimingInfoEXT & setTargetTime( uint64_t targetTime_ ) VULKAN_HPP_NOEXCEPT
->>>>>>> master
     {
       targetTime = targetTime_;
       return *this;
     }
 
-<<<<<<< HEAD
     VULKAN_HPP_CONSTEXPR_14 PresentTimingInfoEXT && setTargetTime( uint64_t targetTime_ ) && VULKAN_HPP_NOEXCEPT
     {
       targetTime = targetTime_;
@@ -156870,15 +156738,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PresentTimingInfoEXT & setTimeDomainId( uint64_t timeDomainId_ ) & VULKAN_HPP_NOEXCEPT
-=======
-    VULKAN_HPP_CONSTEXPR_14 PresentTimingInfoEXT & setTimeDomainId( uint64_t timeDomainId_ ) VULKAN_HPP_NOEXCEPT
->>>>>>> master
     {
       timeDomainId = timeDomainId_;
       return *this;
     }
 
-<<<<<<< HEAD
     VULKAN_HPP_CONSTEXPR_14 PresentTimingInfoEXT && setTimeDomainId( uint64_t timeDomainId_ ) && VULKAN_HPP_NOEXCEPT
     {
       timeDomainId = timeDomainId_;
@@ -156886,15 +156750,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PresentTimingInfoEXT & setPresentStageQueries( PresentStageFlagsEXT presentStageQueries_ ) & VULKAN_HPP_NOEXCEPT
-=======
-    VULKAN_HPP_CONSTEXPR_14 PresentTimingInfoEXT & setPresentStageQueries( PresentStageFlagsEXT presentStageQueries_ ) VULKAN_HPP_NOEXCEPT
->>>>>>> master
     {
       presentStageQueries = presentStageQueries_;
       return *this;
     }
 
-<<<<<<< HEAD
     VULKAN_HPP_CONSTEXPR_14 PresentTimingInfoEXT && setPresentStageQueries( PresentStageFlagsEXT presentStageQueries_ ) && VULKAN_HPP_NOEXCEPT
     {
       presentStageQueries = presentStageQueries_;
@@ -156902,22 +156762,16 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PresentTimingInfoEXT & setTargetTimeDomainPresentStage( PresentStageFlagsEXT targetTimeDomainPresentStage_ ) & VULKAN_HPP_NOEXCEPT
-=======
-    VULKAN_HPP_CONSTEXPR_14 PresentTimingInfoEXT & setTargetTimeDomainPresentStage( PresentStageFlagsEXT targetTimeDomainPresentStage_ ) VULKAN_HPP_NOEXCEPT
->>>>>>> master
     {
       targetTimeDomainPresentStage = targetTimeDomainPresentStage_;
       return *this;
     }
-<<<<<<< HEAD
 
     VULKAN_HPP_CONSTEXPR_14 PresentTimingInfoEXT && setTargetTimeDomainPresentStage( PresentStageFlagsEXT targetTimeDomainPresentStage_ ) && VULKAN_HPP_NOEXCEPT
     {
       targetTimeDomainPresentStage = targetTimeDomainPresentStage_;
       return std::move( *this );
     }
-=======
->>>>>>> master
 #endif /*VULKAN_HPP_NO_SETTERS*/
 
     operator VkPresentTimingInfoEXT const &() const VULKAN_HPP_NOEXCEPT
@@ -157038,17 +156892,12 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-<<<<<<< HEAD
     VULKAN_HPP_CONSTEXPR_14 PresentTimingSurfaceCapabilitiesEXT & setPNext( void * pNext_ ) & VULKAN_HPP_NOEXCEPT
-=======
-    VULKAN_HPP_CONSTEXPR_14 PresentTimingSurfaceCapabilitiesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
->>>>>>> master
     {
       pNext = pNext_;
       return *this;
     }
 
-<<<<<<< HEAD
     VULKAN_HPP_CONSTEXPR_14 PresentTimingSurfaceCapabilitiesEXT && setPNext( void * pNext_ ) && VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -157056,15 +156905,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PresentTimingSurfaceCapabilitiesEXT & setPresentTimingSupported( Bool32 presentTimingSupported_ ) & VULKAN_HPP_NOEXCEPT
-=======
-    VULKAN_HPP_CONSTEXPR_14 PresentTimingSurfaceCapabilitiesEXT & setPresentTimingSupported( Bool32 presentTimingSupported_ ) VULKAN_HPP_NOEXCEPT
->>>>>>> master
     {
       presentTimingSupported = presentTimingSupported_;
       return *this;
     }
 
-<<<<<<< HEAD
     VULKAN_HPP_CONSTEXPR_14 PresentTimingSurfaceCapabilitiesEXT && setPresentTimingSupported( Bool32 presentTimingSupported_ ) && VULKAN_HPP_NOEXCEPT
     {
       presentTimingSupported = presentTimingSupported_;
@@ -157073,16 +156918,11 @@ namespace VULKAN_HPP_NAMESPACE
 
     VULKAN_HPP_CONSTEXPR_14 PresentTimingSurfaceCapabilitiesEXT & setPresentAtAbsoluteTimeSupported( Bool32 presentAtAbsoluteTimeSupported_ ) &
       VULKAN_HPP_NOEXCEPT
-=======
-    VULKAN_HPP_CONSTEXPR_14 PresentTimingSurfaceCapabilitiesEXT &
-      setPresentAtAbsoluteTimeSupported( Bool32 presentAtAbsoluteTimeSupported_ ) VULKAN_HPP_NOEXCEPT
->>>>>>> master
     {
       presentAtAbsoluteTimeSupported = presentAtAbsoluteTimeSupported_;
       return *this;
     }
 
-<<<<<<< HEAD
     VULKAN_HPP_CONSTEXPR_14 PresentTimingSurfaceCapabilitiesEXT && setPresentAtAbsoluteTimeSupported( Bool32 presentAtAbsoluteTimeSupported_ ) &&
       VULKAN_HPP_NOEXCEPT
     {
@@ -157092,16 +156932,11 @@ namespace VULKAN_HPP_NAMESPACE
 
     VULKAN_HPP_CONSTEXPR_14 PresentTimingSurfaceCapabilitiesEXT & setPresentAtRelativeTimeSupported( Bool32 presentAtRelativeTimeSupported_ ) &
       VULKAN_HPP_NOEXCEPT
-=======
-    VULKAN_HPP_CONSTEXPR_14 PresentTimingSurfaceCapabilitiesEXT &
-      setPresentAtRelativeTimeSupported( Bool32 presentAtRelativeTimeSupported_ ) VULKAN_HPP_NOEXCEPT
->>>>>>> master
     {
       presentAtRelativeTimeSupported = presentAtRelativeTimeSupported_;
       return *this;
     }
 
-<<<<<<< HEAD
     VULKAN_HPP_CONSTEXPR_14 PresentTimingSurfaceCapabilitiesEXT && setPresentAtRelativeTimeSupported( Bool32 presentAtRelativeTimeSupported_ ) &&
       VULKAN_HPP_NOEXCEPT
     {
@@ -157110,22 +156945,16 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PresentTimingSurfaceCapabilitiesEXT & setPresentStageQueries( PresentStageFlagsEXT presentStageQueries_ ) & VULKAN_HPP_NOEXCEPT
-=======
-    VULKAN_HPP_CONSTEXPR_14 PresentTimingSurfaceCapabilitiesEXT & setPresentStageQueries( PresentStageFlagsEXT presentStageQueries_ ) VULKAN_HPP_NOEXCEPT
->>>>>>> master
     {
       presentStageQueries = presentStageQueries_;
       return *this;
     }
-<<<<<<< HEAD
 
     VULKAN_HPP_CONSTEXPR_14 PresentTimingSurfaceCapabilitiesEXT && setPresentStageQueries( PresentStageFlagsEXT presentStageQueries_ ) && VULKAN_HPP_NOEXCEPT
     {
       presentStageQueries = presentStageQueries_;
       return std::move( *this );
     }
-=======
->>>>>>> master
 #endif /*VULKAN_HPP_NO_SETTERS*/
 
     operator VkPresentTimingSurfaceCapabilitiesEXT const &() const VULKAN_HPP_NOEXCEPT
@@ -157240,17 +157069,12 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-<<<<<<< HEAD
     VULKAN_HPP_CONSTEXPR_14 PresentTimingsInfoEXT & setPNext( const void * pNext_ ) & VULKAN_HPP_NOEXCEPT
-=======
-    VULKAN_HPP_CONSTEXPR_14 PresentTimingsInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
->>>>>>> master
     {
       pNext = pNext_;
       return *this;
     }
 
-<<<<<<< HEAD
     VULKAN_HPP_CONSTEXPR_14 PresentTimingsInfoEXT && setPNext( const void * pNext_ ) && VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -157258,15 +157082,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PresentTimingsInfoEXT & setSwapchainCount( uint32_t swapchainCount_ ) & VULKAN_HPP_NOEXCEPT
-=======
-    VULKAN_HPP_CONSTEXPR_14 PresentTimingsInfoEXT & setSwapchainCount( uint32_t swapchainCount_ ) VULKAN_HPP_NOEXCEPT
->>>>>>> master
     {
       swapchainCount = swapchainCount_;
       return *this;
     }
 
-<<<<<<< HEAD
     VULKAN_HPP_CONSTEXPR_14 PresentTimingsInfoEXT && setSwapchainCount( uint32_t swapchainCount_ ) && VULKAN_HPP_NOEXCEPT
     {
       swapchainCount = swapchainCount_;
@@ -157274,23 +157094,17 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 PresentTimingsInfoEXT & setPTimingInfos( const PresentTimingInfoEXT * pTimingInfos_ ) & VULKAN_HPP_NOEXCEPT
-=======
-    VULKAN_HPP_CONSTEXPR_14 PresentTimingsInfoEXT & setPTimingInfos( const PresentTimingInfoEXT * pTimingInfos_ ) VULKAN_HPP_NOEXCEPT
->>>>>>> master
     {
       pTimingInfos = pTimingInfos_;
       return *this;
     }
 
-<<<<<<< HEAD
     VULKAN_HPP_CONSTEXPR_14 PresentTimingsInfoEXT && setPTimingInfos( const PresentTimingInfoEXT * pTimingInfos_ ) && VULKAN_HPP_NOEXCEPT
     {
       pTimingInfos = pTimingInfos_;
       return std::move( *this );
     }
 
-=======
->>>>>>> master
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
     PresentTimingsInfoEXT & setTimingInfos( ArrayProxyNoTemporaries<const PresentTimingInfoEXT> const & timingInfos_ ) VULKAN_HPP_NOEXCEPT
     {
@@ -177806,17 +177620,12 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-<<<<<<< HEAD
     VULKAN_HPP_CONSTEXPR_14 SwapchainCalibratedTimestampInfoEXT & setPNext( const void * pNext_ ) & VULKAN_HPP_NOEXCEPT
-=======
-    VULKAN_HPP_CONSTEXPR_14 SwapchainCalibratedTimestampInfoEXT & setPNext( const void * pNext_ ) VULKAN_HPP_NOEXCEPT
->>>>>>> master
     {
       pNext = pNext_;
       return *this;
     }
 
-<<<<<<< HEAD
     VULKAN_HPP_CONSTEXPR_14 SwapchainCalibratedTimestampInfoEXT && setPNext( const void * pNext_ ) && VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -177824,15 +177633,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 SwapchainCalibratedTimestampInfoEXT & setSwapchain( SwapchainKHR swapchain_ ) & VULKAN_HPP_NOEXCEPT
-=======
-    VULKAN_HPP_CONSTEXPR_14 SwapchainCalibratedTimestampInfoEXT & setSwapchain( SwapchainKHR swapchain_ ) VULKAN_HPP_NOEXCEPT
->>>>>>> master
     {
       swapchain = swapchain_;
       return *this;
     }
 
-<<<<<<< HEAD
     VULKAN_HPP_CONSTEXPR_14 SwapchainCalibratedTimestampInfoEXT && setSwapchain( SwapchainKHR swapchain_ ) && VULKAN_HPP_NOEXCEPT
     {
       swapchain = swapchain_;
@@ -177840,15 +177645,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 SwapchainCalibratedTimestampInfoEXT & setPresentStage( PresentStageFlagsEXT presentStage_ ) & VULKAN_HPP_NOEXCEPT
-=======
-    VULKAN_HPP_CONSTEXPR_14 SwapchainCalibratedTimestampInfoEXT & setPresentStage( PresentStageFlagsEXT presentStage_ ) VULKAN_HPP_NOEXCEPT
->>>>>>> master
     {
       presentStage = presentStage_;
       return *this;
     }
 
-<<<<<<< HEAD
     VULKAN_HPP_CONSTEXPR_14 SwapchainCalibratedTimestampInfoEXT && setPresentStage( PresentStageFlagsEXT presentStage_ ) && VULKAN_HPP_NOEXCEPT
     {
       presentStage = presentStage_;
@@ -177856,22 +177657,16 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 SwapchainCalibratedTimestampInfoEXT & setTimeDomainId( uint64_t timeDomainId_ ) & VULKAN_HPP_NOEXCEPT
-=======
-    VULKAN_HPP_CONSTEXPR_14 SwapchainCalibratedTimestampInfoEXT & setTimeDomainId( uint64_t timeDomainId_ ) VULKAN_HPP_NOEXCEPT
->>>>>>> master
     {
       timeDomainId = timeDomainId_;
       return *this;
     }
-<<<<<<< HEAD
 
     VULKAN_HPP_CONSTEXPR_14 SwapchainCalibratedTimestampInfoEXT && setTimeDomainId( uint64_t timeDomainId_ ) && VULKAN_HPP_NOEXCEPT
     {
       timeDomainId = timeDomainId_;
       return std::move( *this );
     }
-=======
->>>>>>> master
 #endif /*VULKAN_HPP_NO_SETTERS*/
 
     operator VkSwapchainCalibratedTimestampInfoEXT const &() const VULKAN_HPP_NOEXCEPT
@@ -179555,17 +179350,12 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-<<<<<<< HEAD
     VULKAN_HPP_CONSTEXPR_14 SwapchainTimeDomainPropertiesEXT & setPNext( void * pNext_ ) & VULKAN_HPP_NOEXCEPT
-=======
-    VULKAN_HPP_CONSTEXPR_14 SwapchainTimeDomainPropertiesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
->>>>>>> master
     {
       pNext = pNext_;
       return *this;
     }
 
-<<<<<<< HEAD
     VULKAN_HPP_CONSTEXPR_14 SwapchainTimeDomainPropertiesEXT && setPNext( void * pNext_ ) && VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -179573,15 +179363,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 SwapchainTimeDomainPropertiesEXT & setTimeDomainCount( uint32_t timeDomainCount_ ) & VULKAN_HPP_NOEXCEPT
-=======
-    VULKAN_HPP_CONSTEXPR_14 SwapchainTimeDomainPropertiesEXT & setTimeDomainCount( uint32_t timeDomainCount_ ) VULKAN_HPP_NOEXCEPT
->>>>>>> master
     {
       timeDomainCount = timeDomainCount_;
       return *this;
     }
 
-<<<<<<< HEAD
     VULKAN_HPP_CONSTEXPR_14 SwapchainTimeDomainPropertiesEXT && setTimeDomainCount( uint32_t timeDomainCount_ ) && VULKAN_HPP_NOEXCEPT
     {
       timeDomainCount = timeDomainCount_;
@@ -179589,23 +179375,17 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 SwapchainTimeDomainPropertiesEXT & setPTimeDomains( TimeDomainKHR * pTimeDomains_ ) & VULKAN_HPP_NOEXCEPT
-=======
-    VULKAN_HPP_CONSTEXPR_14 SwapchainTimeDomainPropertiesEXT & setPTimeDomains( TimeDomainKHR * pTimeDomains_ ) VULKAN_HPP_NOEXCEPT
->>>>>>> master
     {
       pTimeDomains = pTimeDomains_;
       return *this;
     }
 
-<<<<<<< HEAD
     VULKAN_HPP_CONSTEXPR_14 SwapchainTimeDomainPropertiesEXT && setPTimeDomains( TimeDomainKHR * pTimeDomains_ ) && VULKAN_HPP_NOEXCEPT
     {
       pTimeDomains = pTimeDomains_;
       return std::move( *this );
     }
 
-=======
->>>>>>> master
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
     SwapchainTimeDomainPropertiesEXT & setTimeDomains( ArrayProxyNoTemporaries<TimeDomainKHR> const & timeDomains_ ) VULKAN_HPP_NOEXCEPT
     {
@@ -179615,25 +179395,18 @@ namespace VULKAN_HPP_NAMESPACE
     }
 #  endif /*VULKAN_HPP_DISABLE_ENHANCED_MODE*/
 
-<<<<<<< HEAD
     VULKAN_HPP_CONSTEXPR_14 SwapchainTimeDomainPropertiesEXT & setPTimeDomainIds( uint64_t * pTimeDomainIds_ ) & VULKAN_HPP_NOEXCEPT
-=======
-    VULKAN_HPP_CONSTEXPR_14 SwapchainTimeDomainPropertiesEXT & setPTimeDomainIds( uint64_t * pTimeDomainIds_ ) VULKAN_HPP_NOEXCEPT
->>>>>>> master
     {
       pTimeDomainIds = pTimeDomainIds_;
       return *this;
     }
 
-<<<<<<< HEAD
     VULKAN_HPP_CONSTEXPR_14 SwapchainTimeDomainPropertiesEXT && setPTimeDomainIds( uint64_t * pTimeDomainIds_ ) && VULKAN_HPP_NOEXCEPT
     {
       pTimeDomainIds = pTimeDomainIds_;
       return std::move( *this );
     }
 
-=======
->>>>>>> master
 #  if !defined( VULKAN_HPP_DISABLE_ENHANCED_MODE )
     SwapchainTimeDomainPropertiesEXT & setTimeDomainIds( ArrayProxyNoTemporaries<uint64_t> const & timeDomainIds_ ) VULKAN_HPP_NOEXCEPT
     {
@@ -179746,17 +179519,12 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
 #if !defined( VULKAN_HPP_NO_SETTERS ) && !defined( VULKAN_HPP_NO_STRUCT_SETTERS )
-<<<<<<< HEAD
     VULKAN_HPP_CONSTEXPR_14 SwapchainTimingPropertiesEXT & setPNext( void * pNext_ ) & VULKAN_HPP_NOEXCEPT
-=======
-    VULKAN_HPP_CONSTEXPR_14 SwapchainTimingPropertiesEXT & setPNext( void * pNext_ ) VULKAN_HPP_NOEXCEPT
->>>>>>> master
     {
       pNext = pNext_;
       return *this;
     }
 
-<<<<<<< HEAD
     VULKAN_HPP_CONSTEXPR_14 SwapchainTimingPropertiesEXT && setPNext( void * pNext_ ) && VULKAN_HPP_NOEXCEPT
     {
       pNext = pNext_;
@@ -179764,15 +179532,11 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 SwapchainTimingPropertiesEXT & setRefreshDuration( uint64_t refreshDuration_ ) & VULKAN_HPP_NOEXCEPT
-=======
-    VULKAN_HPP_CONSTEXPR_14 SwapchainTimingPropertiesEXT & setRefreshDuration( uint64_t refreshDuration_ ) VULKAN_HPP_NOEXCEPT
->>>>>>> master
     {
       refreshDuration = refreshDuration_;
       return *this;
     }
 
-<<<<<<< HEAD
     VULKAN_HPP_CONSTEXPR_14 SwapchainTimingPropertiesEXT && setRefreshDuration( uint64_t refreshDuration_ ) && VULKAN_HPP_NOEXCEPT
     {
       refreshDuration = refreshDuration_;
@@ -179780,22 +179544,16 @@ namespace VULKAN_HPP_NAMESPACE
     }
 
     VULKAN_HPP_CONSTEXPR_14 SwapchainTimingPropertiesEXT & setRefreshInterval( uint64_t refreshInterval_ ) & VULKAN_HPP_NOEXCEPT
-=======
-    VULKAN_HPP_CONSTEXPR_14 SwapchainTimingPropertiesEXT & setRefreshInterval( uint64_t refreshInterval_ ) VULKAN_HPP_NOEXCEPT
->>>>>>> master
     {
       refreshInterval = refreshInterval_;
       return *this;
     }
-<<<<<<< HEAD
 
     VULKAN_HPP_CONSTEXPR_14 SwapchainTimingPropertiesEXT && setRefreshInterval( uint64_t refreshInterval_ ) && VULKAN_HPP_NOEXCEPT
     {
       refreshInterval = refreshInterval_;
       return std::move( *this );
     }
-=======
->>>>>>> master
 #endif /*VULKAN_HPP_NO_SETTERS*/
 
     operator VkSwapchainTimingPropertiesEXT const &() const VULKAN_HPP_NOEXCEPT
diff --git a/third_party/vulkan/vulkan_video.cppm b/third_party/vulkan/vulkan_video.cppm
index 0228907..a530816 100644
--- a/third_party/vulkan/vulkan_video.cppm
+++ b/third_party/vulkan/vulkan_video.cppm
@@ -21,11 +21,7 @@ VULKAN_HPP_COMPILE_WARNING( VULKAN_HPP_CXX_MODULE_EXPERIMENTAL_WARNING )
 
 #include <vulkan/vulkan_video.hpp>
 
-<<<<<<< HEAD
 export module vulkan:video;
-=======
-export module vulkan_hpp:video;
->>>>>>> master
 
 export namespace VULKAN_HPP_NAMESPACE::VULKAN_HPP_VIDEO_NAMESPACE
 {