Conflicts: flight/pios/stm32f10x/pios_flash_internal.c Conflicts: flight/pios/stm32f10x/pios_flash_internal.c