merge the remaining content from the 1.24-1.1 NMU