fix(etcdstore): fix merge conflict on etcdstore_test (#7483)

<!-- Describe what has changed in this PR -->
**What changed?**
Fixed merge conflict

<!-- Tell your future self why have you made these changes -->
**Why?**
Previous merge caused issues.

<!-- How have you verified this change? Tested locally? Added a unit
test? Checked in staging env? -->
**How did you test it?**
Unit tests and lint passed

<!-- Assuming the worst case, what can be broken when deploying this
change to production? -->
**Potential risks**

<!-- Is it notable for release? e.g. schema updates, configuration or
data migration required? If so, please mention it, and also update
CHANGELOG.md -->
**Release notes**

<!-- Is there any documentation updates should be made for config,
https://cadenceworkflow.io/docs/operation-guide/setup/ ? If so, please
open an PR in https://github.com/cadence-workflow/cadence-docs -->
**Documentation Changes**

---------

Signed-off-by: fimanishi <[email protected]>

Author: fimanishi