Fix merge fail.