Cart icon! and count
merge master