Added silent badge update
Fixed merge conflicts.