# Conflicts: # UAV-ControlSystem/inc/config/eeprom.h # UAV-ControlSystem/src/config/eeprom.c # UAV-ControlSystem/src/main.c