merge tags if present, reset mocks after acl/vpc tests