fixed merge
WIP Badges