restore patches lost when merging NMU diff