fix(smart-contracts): resolve committed merge conflicts in test snapshots

[senmalong]

Summary

This PR resolves all 34 committed merge conflict markers that were blocking the Soroban workspace build and test execution, as described in issue #535.

Changes Made

Removed 34 corrupted test snapshot JSON files containing merge conflict markers:

• 17 files in
• 6 files in
• 11 files in

Resolution Strategy

All conflicts were in test snapshot files () generated by Soroban's test framework. The standard resolution for corrupted snapshots is to delete them and let the test suite regenerate them with the current contract state.

Note: The issue description referenced conflicts in Rust source files (, , and ), but these have already been resolved in upstream main. Only the test snapshot files contained conflict markers.

Conflict Markers Removed

All 34 files had conflict markers with the same head: >>>>>>> 2df3e3b3a809dfb3562e65cb0d42cb71b77b6d25

Verification

After this PR is merged, the following commands should succeed:

cd smart-contracts
git grep -l '^<<<<<<< '  # Should return nothing
cargo build --workspace   # Should build successfully
cargo test --workspace    # Should pass and regenerate all snapshots

Acceptance Criteria from #535

• No conflict markers remain in any tracked file (git grep -c '^<<<<<<< ' returns nothing)
• All conflicted test snapshot files removed to enable regeneration
• Commit follows conventional commits format
• Detailed PR description explains the resolution approach

Notes

The test snapshots will be automatically regenerated when cargo test --workspace is run. This is the standard workflow for Soroban contract test snapshots and ensures they match the current contract implementation.

Resolves #535

[drips-wave]

@senmalong Great news! 🎉 Based on an automated assessment of this PR, the linked Wave issue(s) no longer count against your application limits.

You can now already apply to more issues while waiting for a review of this PR. Keep up the great work! 🚀

Learn more about application limits

[vercel]

@senmalong is attempting to deploy a commit to the Jaja's projects Team on Vercel.

A member of the Team first needs to authorize it.

[devJaja]

@senmalong

Kindly resolve the conflicts

[senmalong]

✅ Merge Conflicts Resolved

Hi @devJaja,

I've resolved all merge conflicts. The branch is now fully up to date with upstream main.

What Was Done

1. Fetched latest from upstream (main at commit 1a8cb1e)
2. Merged upstream/main into this PR branch
3. Resolved 28 modify/delete conflicts by keeping the deletions (our intended approach)
4. Verified no conflicts remain - the branch is clean

Current State

• ✅ Branch is up to date with upstream/main
• ✅ All merge conflicts resolved
• ✅ Only 34 snapshot file deletions remain (as intended)
• ⚠️ Vercel check failing - requires team authorization (not related to code changes)

Files Changed

All 34 deleted files are test snapshots that will be regenerated when cargo test runs:

• 17 files in agent_bidding/test_snapshots/
• 6 files in error-resolver/test_snapshots/
• 11 files in task_store/test_snapshots/

The PR is ready for review and merge. The Vercel deployment failure is just awaiting team authorization and doesn't block the merge.

Resolves #535

[senmalong]

resolved @devJaja