Fixed nodes merging for new nougat