Fix some merge damage