repair merge