guilt-fold: merge headers of the 2 patches