remove duplicate method complete
merge conflicts for badge view