resolve file conflict

[aastopher]

resolve file conflict

[deepsource-io]

Here's the code health analysis summary for commits 1d496d8..ccb200a. View details on DeepSource ↗.

Analysis Summary

Analyzer	Status	Summary	Link
Rust	✅ Success		View Check ↗

---

💡 If you’re a repository administrator, you can configure the quality gates from the settings.

[codspeed-hq]

CodSpeed Performance Report

Merging #18 will not alter performance

_{Comparing stage (ccb200a) with main (1d496d8)}

Summary

✅ 10 untouched benchmarks

[codecov-commenter]

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 100.00%. Comparing base (199b767) to head (ccb200a).
⚠️ Report is 44 commits behind head on main.

Additional details and impacted files

@@            Coverage Diff            @@
##              main       #18   +/-   ##
=========================================
  Coverage   100.00%   100.00%           
=========================================
  Files            5         5           
  Lines          186       186           
=========================================
  Hits           186       186           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

• ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.