added Coverity Scan badge
added Coverity Scan badge + resolved conflict