fixed merge errors.