[#87] Resolve merge conflicts

.gitignore

.gitmodules

config/Libraries.cmake

config/Sources.cmake

config/ext/IncludeShader.cmake

include/vkcv/Context.hpp

include/vkcv/Core.hpp

include/vkcv/DescriptorConfig.hpp

include/vkcv/DescriptorWrites.hpp

include/vkcv/DrawcallRecording.hpp

include/vkcv/File.hpp

include/vkcv/QueueManager.hpp

modules/CMakeLists.txt

modules/meshlet/CMakeLists.txt

modules/meshlet/include/vkcv/meshlet/Tipsify.hpp

modules/meshlet/src/vkcv/meshlet/Tipsify.cpp

modules/shader_compiler/CMakeLists.txt

modules/shader_compiler/include/vkcv/shader/Compiler.hpp

modules/shader_compiler/include/vkcv/shader/GLSLCompiler.hpp

modules/shader_compiler/src/vkcv/shader/Compiler.cpp