onenand: add omitted merge