Fixed some merge errors.