added counter
manual merge