add badge
fix conflict