repair merge damage