toolchain: fix FTM merge conflicts