Fix merge flaw.