repair merge desaster.