Fixed minor merge errors.