i dont want to keep these changes
fixed merge conflict
initial badges set up