Corrected merge errors.