badges bugfixing
merging