NXP-7866 fix bad merge