ran rubo, cleaned em up and all tests pass before pull merge