Correcting merge error.