[#87] Resolve merge conflicts

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

modules/upscaling/CMakeLists.txt

modules/upscaling/config/FidelityFX_FSR.cmake

...es/upscaling/include/vkcv/upscaling/BilinearUpscaling.hpp

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

modules/upscaling/include/vkcv/upscaling/Upscaling.hpp

modules/upscaling/lib/FidelityFX-FSR

modules/upscaling/src/vkcv/upscaling/BilinearUpscaling.cpp

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

modules/upscaling/src/vkcv/upscaling/Upscaling.cpp

projects/mesh_shader/resources/shaders/shader.frag

projects/mesh_shader/src/main.cpp

projects/particle_simulation/src/BloomAndFlares.cpp

projects/particle_simulation/src/main.cpp

projects/voxelization/CMakeLists.txt

projects/voxelization/resources/shaders/postEffects.comp

projects/voxelization/resources/shaders/tonemapping.comp

projects/voxelization/src/Voxelization.cpp

projects/voxelization/src/main.cpp

src/vkcv/Context.cpp