correcting stm32 merge issues