Full Idea
In some interpretations it appears that for Kant two things are finally valuable: good will (unconditionally), and deserved happiness (conditionally on the value of good will).
Gist of Idea
Kant may rate two things as finally valuable: having a good will, and deserving happiness
Source
comment on Immanuel Kant (Critique of Practical Reason [1788]) by Francesco Orsi - Value Theory 2.2
Book Reference
Orsi,Francesco: 'Value Theory' [Bloomsbury 2015], p.30
A Reaction
It doesn't sound difficult to reconcile these two. Just ask 'what is required of someone to deserve happiness?'.
Related Ideas
Idea 18234 The good will is unconditionally good, because it is the only possible source of value [Kant, by Korsgaard]
Idea 1454 Morality is not about making ourselves happy, but about being worthy of happiness [Kant]