fixed badges
fixed merge problem