Major League Pickleball merger with PPA is back on after a falling out threatened the deal