fix: Resolve incorrect merge conflict

[fredcarle]

Relevant issue(s)

Resolves #2673

Description

This PR fixes the incorrect merge conflict in our memory store.

Tasks

• I made sure the code is well commented, particularly hard-to-understand areas.
• I made sure the repository-held documentation is changed accordingly.
• I made sure the pull request title adheres to the conventional commit style (the subset used in the project can be found in tools/configs/chglog/config.yml).
• I made sure to discuss its limitations such as threats to validity, vulnerability to mistake and misuse, robustness to invalidation of assumptions, resource requirements, ...

How has this been tested?

make test

Specify the platform(s) on which this was tested:

• MacOS

[codecov]

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 77.95%. Comparing base (2b70154) to head (f0ab512).

Additional details and impacted files

@@             Coverage Diff             @@
##           develop    #2723      +/-   ##
===========================================
- Coverage    78.06%   77.95%   -0.11%     
===========================================
  Files          310      310              
  Lines        23231    23236       +5     
===========================================
- Hits         18133    18112      -21     
- Misses        3717     3732      +15     
- Partials      1381     1392      +11     

Flag	Coverage Δ
all-tests	77.95% <100.00%> (-0.11%)	⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files	Coverage Δ
datastore/memory/txn.go	98.77% <100.00%> (-1.23%)	⬇️

... and 9 files with indirect coverage changes

---

Continue to review full report in Codecov by Sentry.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 2b70154...f0ab512. Read the comment docs.

[islamaliev]

LGTM!

[nasdf]

Looks good! Thanks for fixing.