Fixing rebase conflicts

.gitignore

.gitmodules

CMakeLists.txt

README.md

Tools/generate_microRTPS_bridge.py

Tools/message_id.py

Tools/px_generate_uorb_topic_files.py

Tools/px_generate_uorb_topic_helper.py

cmake/configs/nuttx_aerocore2_default.cmake

cmake/configs/nuttx_aerofc-v1_default.cmake

cmake/configs/nuttx_auav-x21_default.cmake

cmake/configs/nuttx_crazyflie_default.cmake

cmake/configs/nuttx_esc35-v1_default.cmake

cmake/configs/nuttx_mindpx-v2_default.cmake

cmake/configs/nuttx_px4-stm32f4discovery_default.cmake

cmake/configs/nuttx_px4cannode-v1_default.cmake

cmake/configs/nuttx_px4esc-v1_default.cmake

cmake/configs/nuttx_px4fmu-v1_default.cmake

cmake/configs/nuttx_px4fmu-v2_default.cmake

cmake/configs/nuttx_px4fmu-v2_test.cmake