Fix merge error in D96.