[nobug] typo in merged code