[#111] Resolve merge conflicts

CMakeLists.txt

config/Sources.cmake

include/vkcv/ComputePipelineConfig.hpp

include/vkcv/Core.hpp

include/vkcv/FeatureManager.hpp

include/vkcv/GraphicsPipelineConfig.hpp

include/vkcv/Handles.hpp

include/vkcv/QueueManager.hpp

include/vkcv/Swapchain.hpp

include/vkcv/Window.hpp

modules/gui/include/vkcv/gui/GUI.hpp

modules/gui/src/vkcv/gui/GUI.cpp

modules/scene/include/vkcv/scene/Scene.hpp

modules/scene/src/vkcv/scene/Scene.cpp

modules/upscaling/include/vkcv/upscaling/FSRUpscaling.hpp

modules/upscaling/src/vkcv/upscaling/FSRUpscaling.cpp

projects/first_mesh/src/main.cpp

projects/first_scene/src/main.cpp

projects/first_triangle/src/main.cpp

projects/indirect_dispatch/src/App.cpp