got the admin and rewards
fixed merge conflict