added google badge
fixed conflicts