NXP-13256: fix bad merge