Restore changes that went lost during merge.