repair merge fail