# Conflicts: # src/modules/camera/CameraController.cpp # src/modules/camera/CameraController.h # test/audio.cpp