Fix merge props

[juanrgm]

Summary

https://playground.solidjs.com/anonymous/64e296d1-ec65-4065-b096-b6f50c57e426

https://playground.solidjs.com/anonymous/74d83e67-bd39-4f47-bc84-d4095d4522a8

How did you test this change?

pnpm t

[changeset-bot]

🦋 Changeset detected

Latest commit: 0b37898

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 2 packages

Name	Type
solid-js	Patch
test-integration	Patch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

[coveralls]

Pull Request Test Coverage Report for Build 5191552748

Warning: This coverage report may be inaccurate.

We've detected an issue with your CI configuration that might affect the accuracy of this pull request's coverage report.
To ensure accuracy in future PRs, please see these guidelines.
A quick fix for this PR: rebase it; your next report should be accurate.

• 11 of 11 (100.0%) changed or added relevant lines in 1 file are covered.
• No unchanged relevant lines lost coverage.
• Overall coverage decreased (-0.02%) to 94.24%

---

Totals
Change from base Build 5177320944:	-0.02%
Covered Lines:	4126
Relevant Lines:	4307

---

💛 - Coveralls

[juanrgm]

Could it be merged?

[AlexErrant]

Ryan's off on the conference circuit so merging will likely be delayed til he gets home.

[ryansolid]

Thank you