The problem with merging changes to the ioc file generated by the CubeMX configuration tool is not as simple as merging two text-based source files with localized conflicts. The issue is that CubeMX uses some sort of MCU pin enumeration scheme to ass...