Fixed merge errors.