added diff count
fixed merge
added refresh icon