Fix merge conflicts

.gitlab-ci.yml

EXTERNALS.md

LICENSE

README.md

cmake/WarningLevels.cmake

conanfile.py

demos/viewer/src/navigation_behavior.cpp

demos/viewer/src/rotation_behavior.cpp

demos/viewer/src/viewer_system.hpp

library/CMakeLists.txt

library/phx/assimp_model_loader.hpp

library/phx/behavior_system.hpp

library/phx/blit_pass.cpp

library/phx/clear_pass.cpp

library/phx/clear_pass.hpp

library/phx/engine.hpp

library/phx/geometry_pass.cpp

library/phx/geometry_pass.hpp

library/phx/hmd.cpp

library/phx/hmd.hpp