Made no changes to rewards
COmplete merge error