League and NBPA agree on new CBA