fix some merge errors.