diff --git a/CMakeLists.txt b/CMakeLists.txt
index 53b93ef..473c871 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,13 +35,8 @@ add_subdirectory(projects/extensions)
 add_subdirectory(projects/platform) # build gryphn platform
 
 add_subdirectory(projects/validation_layers/function_loader/)
-<<<<<<< HEAD
-target_link_libraries(Gryphn INTERFACE GryphnCore GryphnLoader GryphnPlatform GryphnFunctionValidator GryphnExtensions)
-=======
 add_subdirectory(projects/validation_layers/allocators/)
-
 target_link_libraries(Gryphn INTERFACE GryphnUtils GryphnCore GryphnLoader GryphnPlatform GryphnFunctionValidator GryphnAllocatorChecker GryphnExtensions)
->>>>>>> acf2f8c22860b57d65172e2356704813fa2e18f0
 
 if (VULKAN_BUILT)
     target_link_libraries(Gryphn INTERFACE GryphnVulkanImpl)
diff --git a/projects/apis/vulkan/src/output_device/vulkan_output_device.c b/projects/apis/vulkan/src/output_device/vulkan_output_device.c
index be0555c..3200ea9 100644
--- a/projects/apis/vulkan/src/output_device/vulkan_output_device.c
+++ b/projects/apis/vulkan/src/output_device/vulkan_output_device.c
@@ -21,6 +21,7 @@ gnReturnCode createVulkanOutputDevice(gnInstanceHandle instance, gnOutputDeviceH
         float queuePriority = 1.0f;
         for (uint32_t i = 0; i < deviceInfo.physicalDevice->physicalDevice->neededQueueCount; i++) {
             queueCreateInfos[i].sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO;
+            queueCreateInfos[i].pNext = NULL;
             queueCreateInfos[i].flags = 0;
             queueCreateInfos[i].queueCount = 1;
             queueCreateInfos[i].queueFamilyIndex = deviceInfo.physicalDevice->physicalDevice->neededQueues[i].queueIndex;
@@ -32,6 +33,7 @@ gnReturnCode createVulkanOutputDevice(gnInstanceHandle instance, gnOutputDeviceH
         for (uint32_t i = 0; i < deviceInfo.queueInfoCount; i++) {
             queueCreateInfos[i].sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO;
             queueCreateInfos[i].flags = 0;
+            queueCreateInfos[i].pNext = NULL;
             queueCreateInfos[i].queueCount = deviceInfo.queueInfos[i].queueCount;
             queueCreateInfos[i].queueFamilyIndex = deviceInfo.queueInfos[i].queueFamilyIndex;
             queueCreateInfos[i].pQueuePriorities = deviceInfo.queueInfos[i].queuePrioritys;
@@ -44,6 +46,8 @@ gnReturnCode createVulkanOutputDevice(gnInstanceHandle instance, gnOutputDeviceH
 
     VkDeviceCreateInfo deviceCreateInfo = {
         .sType = VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO,
+        .flags = 0,
+        .pNext = NULL,
         .queueCreateInfoCount = createQueueCount,
         .pQueueCreateInfos = queueCreateInfos,
         .pEnabledFeatures = &deviceFeatures
@@ -85,7 +89,8 @@ gnReturnCode createVulkanOutputDevice(gnInstanceHandle instance, gnOutputDeviceH
     VkCommandPoolCreateInfo poolInfo = {
         .sType = VK_STRUCTURE_TYPE_COMMAND_POOL_CREATE_INFO,
         .flags = VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT,
-        .queueFamilyIndex = transferQueue
+        .queueFamilyIndex = transferQueue,
+        .pNext = NULL
     };
 
     VkResult command_pool_result = vkCreateCommandPool(device->outputDevice->device, &poolInfo, NULL, &device->outputDevice->transferCommandPool);